diff --git a/conf.sh b/conf.sh index cdab1e7..0447a35 100644 --- a/conf.sh +++ b/conf.sh @@ -10,6 +10,7 @@ if [ -z ${ignphpcms+x} ]; then ignphpcms=0;fi sed -i -e '$a set ssl:verify-certificate no' /etc/lftp.conf sed -i -e '$a set sftp:auto-confirm yes' /etc/lftp.conf + ############## # wp-cli # ############## @@ -20,6 +21,7 @@ wget https://raw.githubusercontent.com/wp-cli/wp-cli/v1.5.1/utils/wp-completion. chmod +x /opt/wp-cli.phar mv /opt/wp-cli.phar /usr/local/bin/wp + ################### # Backup-UTIL # ################### @@ -31,19 +33,21 @@ sed -i "\$a30 3 * * * root bash /opt/BackupUtil/Backup-Util.sh >/dev/null systemctl restart cron wget -q -t7 "$mrepo"/raw/branch/"$mbranch"/Backup-Util.sh -O /opt/BackupUtil/Backup-Util.sh wget -q -t7 "$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 + ############################## # Backup-util Site Setup # ############################## + +if [ -z ${db_suffix+x} ]; then db_suffix=`expr $(ls -l /var/www | grep -c ^d)`;fi wget -q -t7 "$mrepo"/raw/branch/"$mbranch"/config/Motd/50-bckupnotice -O /etc/update-motd.d/50-bckupnotice chmod +x /etc/update-motd.d/50-bckupnotice #CMS WP if [ $CMS = "wordpress" ]; then - echo "SiteBackup -d $domain -sn ${domain%*.*} -db $db_name -sd /var/www/$domain/html -ai1 -wpupdate" >> /opt/BackupUtil/Backup-Util.conf + echo "SiteBackup -d $domain -sn ${domain%*.*} -db wp_$db_suffix -sd /var/www/$domain/html -ai1 -wpupdate" >> /opt/BackupUtil/Backup-Util.conf #MOTD Notice echo 'printf $red "Please run bash ~/wp-backup-Init.sh after initialisation of WP"' >> /etc/update-motd.d/50-bckupnotice echo 'printf "\n"' >> /etc/update-motd.d/50-bckupnotice @@ -56,7 +60,7 @@ if [ $CMS = "none" ]; then fi #CMS Nextcloud, Full non rsync if [ $CMS = "nextcloud" ]; then - echo "SiteBackup -d $domain -sn ${domain%*.*} -db $db_name -sd /var/www/$domain/html" >> /opt/BackupUtil/Backup-Util.conf + echo "SiteBackup -d $domain -sn ${domain%*.*} -db nextcloud_$db_suffix -sd /var/www/$domain/html" >> /opt/BackupUtil/Backup-Util.conf #MOTD Notice echo 'printf $red "Please note that Backup-Util is not optimized for Nextcloud"' >> /etc/update-motd.d/50-bckupnotice echo 'printf "\n"' >> /etc/update-motd.d/50-bckupnotice