diff --git a/.DS_Store b/.DS_Store index 71c28c62a..e761c653f 100644 Binary files a/.DS_Store and b/.DS_Store differ 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