diff --git a/conf.sh b/conf.sh index 2e26a22..a727b9e 100644 --- a/conf.sh +++ b/conf.sh @@ -1,8 +1,6 @@ mrepo=https://git.ictmaatwerk.com/VPS-scripts/Backup-Util mbranch=master -if [ -z ${ignphpcms+x} ]; then ignphpcms=0;fi - if [ $ignphpcms != 1 ]; then ############ # lftp # ############ @@ -32,7 +30,8 @@ systemctl restart cron curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/Backup-Util.sh -o /opt/BackupUtil/Backup-Util.sh curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/Backup-Util/Backup-Util.unconfigured -o /opt/BackupUtil/Backup-Util.conf sed -i -e 's/PASSword/'$password'/g' -e 's/HOSTNAME/'$(hostname -s)'/g' /opt/BackupUtil/Backup-Util.conf -fi +curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/Motd/51-bckupnotice -o /etc/update-motd.d/51-bckupnotice +chmod +x /etc/update-motd.d/51-bckupnotice ################################### @@ -42,7 +41,5 @@ fi if [ -z "${itype}" ]; then if [ -z ${db_suffix+x} ]; then db_suffix=`expr $(ls -l /var/www | grep -c ^d) - 1`;fi - curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/Motd/51-bckupnotice -o /etc/update-motd.d/51-bckupnotice - chmod +x /etc/update-motd.d/51-bckupnotice source <(curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/CMSHook-conf.sh) fi