diff --git a/.DS_Store b/.DS_Store index 76aef38aa..4bed96c06 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/cyberpanel.sh b/cyberpanel.sh index 83f2f0c21..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" @@ -44,22 +52,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 } @@ -101,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 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} "