diff --git a/directadmin-1.62.4.tar.gz b/directadmin-1.62.4.tar.gz index 1047686..73335bc 100644 Binary files a/directadmin-1.62.4.tar.gz and b/directadmin-1.62.4.tar.gz differ diff --git a/directadmin-1.62.4/directadmin.conf b/directadmin-1.62.4/directadmin.conf deleted file mode 100644 index 83976f3..0000000 --- a/directadmin-1.62.4/directadmin.conf +++ /dev/null @@ -1,86 +0,0 @@ -add_userdb_quota=1 -admin_ssl_check_retries=0 -apache_public_html=0 -apache_ver=2.0 -backup_gzip=2 -brute_dos_count=100 -brute_force_log_scanner=1 -brute_force_scan_apache_logs=2 -brute_force_time_limit=1200 -brutecount=10 -bruteforce=1 -carootcert=/usr/local/directadmin/conf/carootcert.pem -check_load=0 -check_partitions=1 -check_subdomain_owner=0 -clear_blacklist_ip_time=86400 -clear_brute_log_entry_time=4 -clear_brute_log_time=24 -cloud_cache=0 -da_gzip=1 -dataskq_max_instances=1 -default_private_html_link=1 -demodocsroot=./data/skins/evolution -disable_ip_check=1 -disk_usage_suspend=0 -dkim=1 -dns_ttl=1 -docsroot=./data/skins/evolution -dovecot=1 -email_ftp_password_change=1 -enforce_difficult_passwords=0 -ethernet_dev=eth0:100 -exempt_local_block=1 -filemanager_du=1 -frontpage_on=0 -get_current_version_timeout=0 -hide_brute_force_notifications=1 -http2=1 -ip_brutecount=20 -ipv6=0 -jail=1 -letsencrypt=1 -litespeed=0 -logs_to_keep=5 -lost_password=0 -mail_sni=1 -max_per_email_send_limit=-1 -max_username_length=30 -maxfilesize=21474836480 -mysql_detect_correct_methods=1 -nginx=1 -nginx_proxy=0 -notify_on_license_update=0 -ns1=ns1.s172d15.wpcloud.vn -ns2=ns2.s172d15.wpcloud.vn -one_click_pma_login=1 -one_click_webmail_login=1 -openlitespeed=0 -partition_usage_threshold=95 -php_fpm_max_children_default=10 -pointers_own_virtualhost=1 -port=8443 -pureftp=0 -purge_spam_days=0 -quota_partition=/ -random_password_length=20 -secure_access_group=access -servername=s172d15.wpcloud.vn -session_minutes=600 -show_info_in_header=0 -show_info_in_title=0 -special_characters_in_random_passwords=2 -ssl=1 -ssl_redirect_host=s172d15.wpcloud.vn -system_user_to_virtual_passwd=1 -timeout=600 -unblock_brute_ip_time=86400 -unified_ftp_password_file=1 -use_cookie_expires=0 -use_xfs_quota=1 -user_brutecount=20 -user_can_set_email_limit=1 -webmail_link=roundcube -x_frame_options=sameorigin -zip=1 -zstd=1 diff --git a/directadmin-1.62.4/license.key b/directadmin-1.62.4/license.key deleted file mode 100644 index 2fb9f55..0000000 Binary files a/directadmin-1.62.4/license.key and /dev/null differ diff --git a/directadmin-1.62.4/scripts/install.sh b/directadmin-1.62.4/scripts/install.sh index 5d95f10..ae2ec53 100644 --- a/directadmin-1.62.4/scripts/install.sh +++ b/directadmin-1.62.4/scripts/install.sh @@ -448,7 +448,7 @@ touchExim ${DA_SCRIPTS}/cron_deny.sh touch /root/.skip_get_license getLicense -#getServices +getServices if [ ! -e ${DA_PATH}/custombuild/options.conf ] && [ -e /etc/redhat-release ] && [ ! -e /etc/init.d/xinetd ] && [ -e /usr/bin/yum ]; then yum -y install xinetd diff --git a/install.sh b/install.sh index 1bb74f5..dd64310 100644 --- a/install.sh +++ b/install.sh @@ -753,7 +753,7 @@ fi ############################################################################### # write the setup.txt - +echo "Chạy write the setup.txt $SETUP" echo "hostname=$HOST" > $SETUP; echo "email=$EMAIL" >> $SETUP; echo "mysql=$DB_ROOT_PASS" >> $SETUP; @@ -783,6 +783,7 @@ chmod 600 $SETUP cd $SCRIPTS_PATH; +echo "Chạy ./install.sh $CMD_LINE" ./install.sh $CMD_LINE RET=$? diff --git a/update.tar.gz b/update.tar.gz deleted file mode 100644 index f15599d..0000000 Binary files a/update.tar.gz and /dev/null differ diff --git a/update/scripts/install.sh b/update/scripts/install.sh index 39da192..64a2cc7 100644 --- a/update/scripts/install.sh +++ b/update/scripts/install.sh @@ -478,7 +478,8 @@ ${DA_SCRIPTS}/cron_deny.sh echo "Chạy getLicense" getLicense -#getServices +echo "Chạy getServices" +getServices if [ ! -e ${DA_PATH}/custombuild/options.conf ] && [ -e /etc/redhat-release ] && [ ! -e /etc/init.d/xinetd ] && [ -e /usr/bin/yum ]; then yum -y install xinetd diff --git a/update/scripts/setup.sh b/update/scripts/setup.sh index 8cf8253..471ca44 100644 --- a/update/scripts/setup.sh +++ b/update/scripts/setup.sh @@ -1731,7 +1731,7 @@ if [ $COUNT -ne 0 ]; then fi cd $DA_PATH; -tar xzf update.tar.gz +//tar xzf update.tar.gz if [ ! -e $DA_PATH/directadmin ]; then echo "Cannot find the DirectAdmin binary. Extraction failed"; @@ -1751,7 +1751,7 @@ fi ############################################################################### # write the setup.txt - +echo "Chạy write the $SETUP" echo "hostname=$HOST" > $SETUP; echo "email=$EMAIL" >> $SETUP; echo "mysql=$DB_ROOT_PASS" >> $SETUP; @@ -1782,6 +1782,8 @@ chmod 600 $SETUP cd $SCRIPTS_PATH; chmod 700 install.sh + +echo "Chạy ./install.sh $CMD_LINE" ./install.sh $CMD_LINE RET=$? @@ -1812,32 +1814,6 @@ if [ -e /etc/aliases ]; then fi fi -#CSF if AUTO -if [ "${OS}" != "FreeBSD" ] && [ "${AUTO}" = "1" ]; then - CSF_LOG=/var/log/directadmin/csf_install.log - CSF_SH=/root/csf_install.sh - wget -O ${CSF_SH} ${SERVER}/all/csf/csf_install.sh > ${CSF_LOG} 2>&1 - if [ ! -s ${CSF_SH} ]; then - echo "Error downloading ${SERVER}/all/csf/csf_install.sh" - cat ${CSF_LOG} - else - #run it - chmod 755 ${CSF_SH} - ${CSF_SH} auto >> ${CSF_LOG} 2>&1 - USE_IPSET=true - if [ -x /usr/bin/systemd-detect-virt ]; then - if systemd-detect-virt | grep -m1 -q -E 'lxc|openvz'; then - USE_IPSET=false - fi - fi - if ${USE_IPSET} && grep -m1 -q '^LF_IPSET = "0"' /etc/csf/csf.conf; then - perl -pi -e 's|^LF_IPSET = "0"|LF_IPSET = "1"|g' /etc/csf/csf.conf - csf -r >> /dev/null 2>&1 - fi - fi - - ${BUILD} secure_php -fi rm -f /usr/lib/sendmail ln -s ../sbin/sendmail /usr/lib/sendmail