From cb42167d81b7d7e0b3a4f0828c68c86fc87b2f73 Mon Sep 17 00:00:00 2001
From: qtwrk <qtwrk555@gmail.com>
Date: Tue, 21 Jan 2020 18:55:14 +0100
Subject: [PATCH 1/3] no more need bashrc

---
 .DS_Store     | Bin 10244 -> 10244 bytes
 cyberpanel.sh |  30 ++++++++++++++----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 76aef38aac911b3f08c17609d171d2d8f07aa6bb..71c28c62ac9bb0207bf0adbb35df07824e48d973 100644
GIT binary patch
delta 685
zcmZWmL2nX482!GowxCs(7Fud-f)W#x5<}D0+Cy842gM#(3mUL0?k>Z!ahO?Ww@`|R
zhaNl`O;7d*^lrGAn0WJ`cQ0Q210H(u(vu4dX=3N{-hA(y_h#nXSN4_nSzP<1d<o)O
zcU<0(u8u+lRCozD!G>yva$Tcb0{|I7`U`-&-E`QH4w})>xYn?(f%^U6N90W>+G;JW
zEF@w}w^!PUSZjGXnTRbe+-kQ2{^{%UtC{Du=3eVn`}IfH&s~TfLU4dXICP00ETF)_
z026fgM%2{ngEaiAS=6+hWb(Hx<A_f>H#+7IoWIZ+zj!GqhbAUN;ZP(pH64x2T%Ng7
zk|#A)e_;r|!^(F!<swaYNWs)O%b9zm;E-LXM@sU<e|=k|{Oq)pZ(43o__WaXx+@4_
z+lDa9*-EEk6Q?lP^mwr(2W?$&N)>LKj>%c^iCyK5j6-S}R^e`B-6V~y)syT;MA$B#
zIa7E_RgKUrOLNEJwW2D7$_$cj_BwlR?n@Lw>Sl*D`r$cC)lFu^*N?pqji;0$x#1BR
z;vNBrr^MSn_sbZ_GtNjLp4uF!ewc#|xDPp~LId8xAsoSH_y)h=51gQcQ+N&Ma1mE=
z9q-}h1Kh$qKE%hk?HP;=Cp<fh^AO7}o|$kxCm7|-a5d~6MQ5cC_4)2t>_qDR4Eucl
E06A!|jQ{`u

delta 258
zcmZXNzY4-I7{sr(;v(2V7e#b(E5sW52V5Fk!O2ceF4nbB9Hod$AHY{B8TH9r^eQ?T
zxa7XO@cpW^N^e_ZS*Q1&vD95Vvh=yXxAbE)w5~Ihm}7+q0*VR{!+}S?_&7=LAz>C^
zP5E>_6A70}cnkiNYyw<1d2!70A_HIp?J-~+Uf;v4VR;D2i^=o(`a7<RI4Z^t*9gXf
lPI0wj<FIoHZl<OQiIL3zVH3j2AFMtVE!~+uE$s|U^9?%OI066w

diff --git a/cyberpanel.sh b/cyberpanel.sh
index 83f2f0c21..c79b70d42 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -44,22 +44,20 @@ wget -q -O /usr/bin/cyberpanel_utility https://cyberpanel.sh/misc/cyberpanel_uti
 chmod 700 /usr/bin/cyberpanel_utility
 fi
 
-#<< --COMMENTOUT--
-BASH_PATH="/root/.bashrc"
-if ! cat $BASH_PATH | grep -q cyberpanel_utility ; then
-echo -e "\n\ncyberpanel() {
-if [[ \$1 == \"utility\" ]] ; then
-/usr/bin/cyberpanel_utility \${@:2:99}
-elif [[ \$1 == \"help\" ]] ; then
-/usr/bin/cyberpanel_utility --help
-elif [[ \$1 == \"upgrade\" ]] || [[ \$1 == \"update\" ]] ; then
-/usr/bin/cyberpanel_utility --upgrade
-else
-/usr/bin/cyberpanel \"\$@\"
-fi
-}" >> $BASH_PATH
-fi
-#--COMMENTOUT--
+#BASH_PATH="/root/.bashrc"
+#if ! cat $BASH_PATH | grep -q cyberpanel_utility ; then
+#echo -e "\n\ncyberpanel() {
+#if [[ \$1 == \"utility\" ]] ; then
+#/usr/bin/cyberpanel_utility \${@:2:99}
+#elif [[ \$1 == \"help\" ]] ; then
+#/usr/bin/cyberpanel_utility --help
+#elif [[ \$1 == \"upgrade\" ]] || [[ \$1 == \"update\" ]] ; then
+#/usr/bin/cyberpanel_utility --upgrade
+#else
+#/usr/bin/cyberpanel \"\$@\"
+#fi
+#}" >> $BASH_PATH
+#fi
 
 }
 

From 6ce7d3820f0b78651f2e179316487afc6eda5eb4 Mon Sep 17 00:00:00 2001
From: qtwrk <qtwrk555@gmail.com>
Date: Thu, 23 Jan 2020 22:32:39 +0100
Subject: [PATCH 2/3] bug fix

---
 .DS_Store             | Bin 10244 -> 12292 bytes
 cyberpanel.sh         |  13 +++++++++++--
 cyberpanel_upgrade.sh |   6 +++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 71c28c62ac9bb0207bf0adbb35df07824e48d973..e761c653fe10b322024a7e68ae56cc47b0a2f0f0 100644
GIT binary patch
delta 223
zcmZn(Xh~3DU|?W$DortDV9)?EIe-{M3-ADmb_NCo?uiQOvdlmZBM>_PF_105z>vp~
z$dJyE$`H(uI<ZiBvVjT<D@Xy$WEKhA$-V;S8w;7)H?woFa4<@5c93Xbo!lWSIr*8y
z4OJe7VxYDnhB7c2%uoU}sDz=Ep|~u#C@&{JFCAzK<L14xUQ8Ps<k=ZjHuDJlW|w3I
qiUNTKH;`~ecHPFp_so;|RSX#!Cfo2xvjE+|F*!qJ=H{Ow+{^%*IVwE>

delta 154
zcmZokXbF&DU|?W$DortDU{C-uIe-{M3-C-V6q~3gIoUvmMH0woumfU7pg03V27@z0
zK0_Wu2}9B5gA!islNA^vH?woFa4_0!=27^~K5??uW?q4M*3C=B+?fQKL7IVPasvrh
nkhz-$8NV}6=GQS~1sccDFxgQ@nu7^qvBu;Cotc{%RhgLq4k#N;

diff --git a/cyberpanel.sh b/cyberpanel.sh
index c79b70d42..f1ef94853 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -2,9 +2,17 @@
 
 #CyberPanel installer script for CentOS 7.X, CentOS 8.X, CloudLinux 7.X and Ubuntu 18.04
 
-export LC_CTYPE=en_US.UTF-8
-
 SUDO_TEST=$(set)
+
+export LC_CTYPE=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+if [[ $? != "0" ]] ; then
+	apt upgrade
+	DEBIAN_FRONTEND=noninteractive apt install -y locales
+	locale-gen "en_US.UTF-8"
+	update-locale LC_ALL="en_US.UTF-8"
+fi
+
 DEV="OFF"
 BRANCH="stable"
 POSTFIX_VARIABLE="ON"
@@ -99,6 +107,7 @@ TEMP=`/usr/local/lsws/admin/fcgi-bin/${php_command} /usr/local/lsws/admin/misc/h
 echo "" > /usr/local/lsws/admin/conf/htpasswd
 echo "admin:$TEMP" > /usr/local/lsws/admin/conf/htpasswd
 echo ${WEBADMIN_PASS} > /etc/cyberpanel/webadmin_passwd
+chmod 600 /etc/cyberpanel/webadmin_passwd
 }
 
 check_virtualization() {
diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index af932faf1..0dcc91b37 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -154,12 +154,16 @@ cp lswsgi /usr/local/CyberCP/bin/
 
 chmod 700 /usr/bin/adminPass
 
+if [[ -f /etc/cyberpanel/webadmin_passwd ]] ; then
+chmod 600 /etc/cyberpanel/webadmin_passwd
+fi
+
 if [[ -f /etc/pure-ftpd/pure-ftpd.conf ]] ; then
 sed -i 's|NoAnonymous                 no|NoAnonymous                 yes|g' /etc/pure-ftpd/pure-ftpd.conf
 fi
 
 
-#install_utility
+install_utility
 
 
 

From 56dc5a01e8a784a3727530dfa1672e35314dbe35 Mon Sep 17 00:00:00 2001
From: qtwrk <qtwrk555@gmail.com>
Date: Fri, 24 Jan 2020 14:06:24 +0100
Subject: [PATCH 3/3] FAQ how to enable auto index

---
 .DS_Store | Bin 12292 -> 12292 bytes
 faq.sh    |   6 ++++++
 2 files changed, 6 insertions(+)

diff --git a/.DS_Store b/.DS_Store
index e761c653fe10b322024a7e68ae56cc47b0a2f0f0..4bed96c064036c057643a8c4d40412a5153d6ed8 100644
GIT binary patch
delta 18
ZcmZokXi3=cSBbTjfq}7MGm|nCF91Qz1%dzo

delta 18
ZcmZokXi3=cS81|<C<|l7W+r7OUI0W<1+)MF

diff --git a/faq.sh b/faq.sh
index 414ea980d..b068f6fbb 100644
--- a/faq.sh
+++ b/faq.sh
@@ -74,4 +74,10 @@ ${BLUE}------------------------------------------------------------${NC}
 ${PURPLE}8.${NC} How to remove 8090 port in CyberPanel URL ?
 
 Please check this post ${GREEN}https://blog.cyberpanel.net/2018/12/25/how-to-remove-port-8090-from-cyberpanel/${NC}
+
+${BLUE}------------------------------------------------------------${NC}
+
+${PURPLE}9.${NC} How to enable Auto-Index for my site ?
+
+Please check this post ${GREEN}https://forums.cyberpanel.net/discussion/3850/tutorial-how-to-enable-auto-index-on-openlitespeed-and-litespeed-enterprise${NC}
 "