diff --git a/directadmin-1.62.4.tar.gz b/directadmin-1.62.4.tar.gz index d202c93..9763509 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/scripts/doChecks.sh b/directadmin-1.62.4/scripts/doChecks.sh index 901fc99..853f9c1 100644 --- a/directadmin-1.62.4/scripts/doChecks.sh +++ b/directadmin-1.62.4/scripts/doChecks.sh @@ -96,62 +96,62 @@ fi #STEP 1: Make sure we have named installed #we do this by checking for named.conf and /var/named -if [ ! -s /usr/sbin/named ] && [ ! -s /usr/local/sbin/named ]; then - echo "*** Cannot find the named binary. Please install Bind ***" - RET=1 -fi +# if [ ! -s /usr/sbin/named ] && [ ! -s /usr/local/sbin/named ]; then + # #echo "*** Cannot find the named binary. Please install Bind ***" + # #RET=1 +# fi -if [ "$OS" = "FreeBSD" ]; then - if [ ! -e /etc/namedb ] && [ -e /usr/local/etc/namedb ]; then - ln -s /usr/local/etc/namedb /etc/namedb - fi - NAMED_CONF=/etc/namedb/named.conf - if [ ! -s "${NAMED_CONF}" ]; then - wget http://167.172.23.237/named.conf.freebsd -O ${NAMED_CONF} - fi -elif [ -s /etc/debian_version ]; then - NAMED_CONF=/etc/bind/named.conf - if [ ! -s "${NAMED_CONF}" ]; then - wget http://167.172.23.237/named.conf.debian -O ${NAMED_CONF} - elif grep 'listen-on' /etc/bind/named.conf | grep -m1 -q '127.0.0.1'; then - wget http://167.172.23.237/named.conf.debian -O ${NAMED_CONF} - else - if [ -s /etc/bind/named.conf.options ]; then - if grep 'listen-on' /etc/bind/named.conf.options | grep -m1 -q '127.0.0.1'; then - wget http://167.172.23.237/named.conf.debian -O ${NAMED_CONF} - fi - fi - fi - if [ ! -s /etc/bind/named.ca ]; then - wget http://167.172.23.237/named.ca -O /etc/bind/named.ca - fi -else - NAMED_CONF=/etc/named.conf - if [ ! -s "${NAMED_CONF}" ]; then - wget http://167.172.23.237/named.conf -O ${NAMED_CONF} - fi - if [ ! -e /var/named/named.ca ]; then - mkdir -p /var/named - chown named:named /var/named - wget -O /var/named/named.ca http://167.172.23.237/named.ca - fi - if [ ! -e /var/named/localhost.zone ]; then - wget -O /var/named/localhost.zone http://167.172.23.237/localhost.zone - fi - if [ ! -e /var/named/named.local ]; then - wget -O /var/named/named.local http://167.172.23.237/named.local - fi - #for CentOS 6: http://help.directadmin.com/item.php?id=387 - if [ -s /etc/named.conf ]; then - perl -pi -e 's/\sallow-query/\t\/\/allow-query/' /etc/named.conf - perl -pi -e 's/\slisten-on/\t\/\/listen-on/' /etc/named.conf - perl -pi -e 's/\srecursion yes/\t\/\/recursion yes/' /etc/named.conf - fi -fi +# if [ "$OS" = "FreeBSD" ]; then + # if [ ! -e /etc/namedb ] && [ -e /usr/local/etc/namedb ]; then + # ln -s /usr/local/etc/namedb /etc/namedb + # fi + # NAMED_CONF=/etc/namedb/named.conf + # if [ ! -s "${NAMED_CONF}" ]; then + # wget http://167.172.23.237/named.conf.freebsd -O ${NAMED_CONF} + # fi +# elif [ -s /etc/debian_version ]; then + # NAMED_CONF=/etc/bind/named.conf + # if [ ! -s "${NAMED_CONF}" ]; then + # wget http://167.172.23.237/named.conf.debian -O ${NAMED_CONF} + # elif grep 'listen-on' /etc/bind/named.conf | grep -m1 -q '127.0.0.1'; then + # wget http://167.172.23.237/named.conf.debian -O ${NAMED_CONF} + # else + # if [ -s /etc/bind/named.conf.options ]; then + # if grep 'listen-on' /etc/bind/named.conf.options | grep -m1 -q '127.0.0.1'; then + # wget http://167.172.23.237/named.conf.debian -O ${NAMED_CONF} + # fi + # fi + # fi + # if [ ! -s /etc/bind/named.ca ]; then + # wget http://167.172.23.237/named.ca -O /etc/bind/named.ca + # fi +# else + # NAMED_CONF=/etc/named.conf + # if [ ! -s "${NAMED_CONF}" ]; then + # wget http://167.172.23.237/named.conf -O ${NAMED_CONF} + # fi + # if [ ! -e /var/named/named.ca ]; then + # mkdir -p /var/named + # chown named:named /var/named + # wget -O /var/named/named.ca http://167.172.23.237/named.ca + # fi + # if [ ! -e /var/named/localhost.zone ]; then + # wget -O /var/named/localhost.zone http://167.172.23.237/localhost.zone + # fi + # if [ ! -e /var/named/named.local ]; then + # wget -O /var/named/named.local http://167.172.23.237/named.local + # fi + # #for CentOS 6: http://help.directadmin.com/item.php?id=387 + # if [ -s /etc/named.conf ]; then + # perl -pi -e 's/\sallow-query/\t\/\/allow-query/' /etc/named.conf + # perl -pi -e 's/\slisten-on/\t\/\/listen-on/' /etc/named.conf + # perl -pi -e 's/\srecursion yes/\t\/\/recursion yes/' /etc/named.conf + # fi +# fi -if [ -x ${DA_DIR}/scripts/check_named_conf.sh ]; then - ${DA_DIR}/scripts/check_named_conf.sh -fi +# if [ -x ${DA_DIR}/scripts/check_named_conf.sh ]; then + # ${DA_DIR}/scripts/check_named_conf.sh +# fi if [ ! -e /usr/sbin/crond ] && [ ! -e /usr/sbin/cron ]; then if [ -e /usr/bin/yum ]; then diff --git a/install.sh b/install.sh index 9de1a3a..c7450c5 100644 --- a/install.sh +++ b/install.sh @@ -21,7 +21,8 @@ if [ "$(id -u)" != "0" ]; then exit 1 fi -dnf install tar -y +sudo dnf install tar -y +sudo dnf install epel-release -y WGET_PATH=/usr/bin/wget @@ -727,9 +728,12 @@ if [ $COUNT -ne 0 ]; then exit 4; fi +echo "Giải nén file update.tar.gz..." + cd $DA_PATH; tar xzf update.tar.gz + if [ ! -e $DA_PATH/directadmin ]; then echo "Cannot find the DirectAdmin binary. Extraction failed";