diff --git a/AppendCMS.sh b/AppendCMS.sh index af589f6..126e507 100644 --- a/AppendCMS.sh +++ b/AppendCMS.sh @@ -227,4 +227,12 @@ if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$re fi if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CMS/"$CMS"/"$webserv"-conf.sh; then source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CMS/"$CMS"/"$webserv"-conf.sh) -fi \ No newline at end of file +fi + + +##-------## +# Done # +##-------## + +bash /etc/update-motd.d/51* +msg " Added CMS!" \ No newline at end of file diff --git a/AppendModule.sh b/AppendModule.sh index 59730bc..b48b579 100644 --- a/AppendModule.sh +++ b/AppendModule.sh @@ -252,3 +252,11 @@ for val1 in ${option[*]}; do fi fi done + + +##-------## +# Done # +##-------## + +bash /etc/update-motd.d/51* +msg " Added Module!" \ No newline at end of file diff --git a/CMS/nextcloud/nextcloud-init.sh b/CMS/nextcloud/nextcloud-init.sh index dda8f29..7e4931b 100644 --- a/CMS/nextcloud/nextcloud-init.sh +++ b/CMS/nextcloud/nextcloud-init.sh @@ -17,4 +17,4 @@ else fi echo "*/5 * * * * SITEname php -f /var/www/DOMAINname/html/cron.php > /dev/null 2>&1" >> /etc/crontab -rm -f /etc/update-motd.d/50-nextnotice \ No newline at end of file +rm -f /etc/update-motd.d/51-nextnotice \ No newline at end of file diff --git a/CMS/nextcloud/nginx-conf.sh b/CMS/nextcloud/nginx-conf.sh index 0edb9ca..1732b9c 100644 --- a/CMS/nextcloud/nginx-conf.sh +++ b/CMS/nextcloud/nginx-conf.sh @@ -45,5 +45,5 @@ chown "$sitename":"$sitename" -R /var/www/"$domain"/html #Makeing nextcloud Finalize script and setting login Notice wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/nextcloud-init.sh -O ~/nextcloud-init.sh sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' ~/nextcloud-init.sh -wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/MotdNextCloud -O /etc/update-motd.d/50-nextnotice -chmod +x /etc/update-motd.d/50-nextnotice +wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/MotdNextCloud -O /etc/update-motd.d/51-nextnotice +chmod +x /etc/update-motd.d/51-nextnotice diff --git a/CMS/wordpress/conf.sh b/CMS/wordpress/conf.sh index fa678db..e94584e 100644 --- a/CMS/wordpress/conf.sh +++ b/CMS/wordpress/conf.sh @@ -45,5 +45,5 @@ chown "$sitename":"$sitename" -R /var/www/"$domain"/html #Makeing wordpress Finalize script and setting login Notice wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/wordpress/wordpress-init.sh -O ~/wordpress-init.sh sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' ~/wordpress-init.sh -wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/wordpress/MotdWordpress -O /etc/update-motd.d/50-wpnotice -chmod +x /etc/update-motd.d/50-wpnotice \ No newline at end of file +wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/wordpress/MotdWordpress -O /etc/update-motd.d/51-wpnotice +chmod +x /etc/update-motd.d/51-wpnotice \ No newline at end of file diff --git a/CMS/wordpress/wordpress-init.sh b/CMS/wordpress/wordpress-init.sh index b5a8b39..f7e9ccb 100644 --- a/CMS/wordpress/wordpress-init.sh +++ b/CMS/wordpress/wordpress-init.sh @@ -2,4 +2,4 @@ sudo -u SITEname wp --path=/var/www/DOMAINname/html core update sudo -u SITEname wp --path=/var/www/DOMAINname/html plugin update --all sudo -u SITEname wp --path=/var/www/DOMAINname/html theme update --all sudo -u SITEname wp --path=/var/www/DOMAINname/html plugin install wp-fail2ban --activate -rm -f /etc/update-motd.d/50-wpnotice \ No newline at end of file +rm -f /etc/update-motd.d/51-wpnotice \ No newline at end of file diff --git a/installer.sh b/installer.sh index c7cd8ed..ceb1c16 100644 --- a/installer.sh +++ b/installer.sh @@ -187,7 +187,6 @@ if [ $IMODE = n ]; then if [ $TestMode = 0 ]; then domain=$(whiptail --nocancel --inputbox " Enter the domain without WWW " 11 82 --title "Config" 3>&1 1>&2 2>&3) if (whiptail --title "Set sitename?" --yesno "Set sitename to ${domain//./_} ?" 8 78); then - echo "Yes" sitename=${domain//./_} else while true; do @@ -579,4 +578,5 @@ systemctl reload sshd postfix postfix@- # Done # ##-------## -msg " Done installing!" +bash /etc/update-motd.d/51* +msg " Done installing!" \ No newline at end of file