Work_Archive/VPS-scripts_Web-V2
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 11 Wiki Activity

updated postfix module and fixed CMS motd

Browse Source
This commit is contained in:
Bram Prieshof
2020-10-15 12:20:23 +02:00
parent b475a7f365
commit 8ad35db685
9 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMS/nextcloud/conf.sh
View File

@@ -41,9 +41,9 @@ chown "$sitename":"$sitename" -R /var/www/"$domain"/html
#Makeing nextcloud Finalize script and setting login Notice
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/nextcloud-init.sh -o ~/NextcloudInit-"$sitename".sh
sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' ~/NextcloudInit-"$sitename".sh
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/MotdNextCloud -o /etc/update-motd.d/51-nextnotice
sed -i -e 's/SITEname/'$sitename'/' /etc/update-motd.d/51-nextnotice
chmod +x /etc/update-motd.d/51-nextnotice
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/MotdNextCloud -o /etc/update-motd.d/51-nextnotice-"$sitename"
sed -i -e 's/SITEname/'$sitename'/' /etc/update-motd.d/51-nextnotice-"$sitename"
chmod +x /etc/update-motd.d/51-nextnotice-"$sitename"
#Nextcloud logging location

2
CMS/nextcloud/nextcloud-init.sh
View File

@@ -17,7 +17,7 @@ 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/51-nextnotice
rm -f /etc/update-motd.d/51-nextnotice-SITEname
#Remove script
while true; do

2
CMS/nextcloud/nginx-conf.sh
View File

@@ -4,7 +4,7 @@
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/Nginx-unconfigured -o /tmp/nginx-siteconf
sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/g' -e 's/SITEname/'$sitename'/g' /tmp/nginx-siteconf
sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/"$sitename"_"$site_ext"
if [ $sslenable = 0 ]; then
if [ $site_ext = nossl ]; then
sed -i -e '/fastcgi_param HTTPS/c\# fastcgi_param HTTPS' /etc/nginx/sites-available/"$sitename"_nossl
fi

6
CMS/wordpress/conf.sh
View File

@@ -50,6 +50,6 @@ chown "$sitename":"$sitename" -R /var/www/"$domain"/html
#Makeing wordpress Finalize script and setting login Notice
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpress/wordpress-init.sh -o ~/WordpressInit-"$sitename".sh
sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' ~/WordpressInit-"$sitename".sh
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpress/MotdWordpress -o /etc/update-motd.d/51-wpnotice
sed -i -e 's/SITEname/'$sitename'/' /etc/update-motd.d/51-wpnotice
chmod +x /etc/update-motd.d/51-wpnotice
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpress/MotdWordpress -o /etc/update-motd.d/51-wpnotice-"$sitename"
sed -i -e 's/SITEname/'$sitename'/' /etc/update-motd.d/51-wpnotice-"$sitename"
chmod +x /etc/update-motd.d/51-wpnotice-"$sitename"

2
CMS/wordpress/wordpress-init.sh
View File

@@ -6,7 +6,7 @@ sudo -u SITEname wp --path=/var/www/DOMAINname/html plugin install https://git.i
sudo -u SITEname wp --path=/var/www/DOMAINname/html cron event run wp_update_plugins
sudo -u SITEname wp --path=/var/www/DOMAINname/html plugin update --all
echo -e "\e[96m Please update all-in-one-wp-migration-unlimited plugin manually\e[39m"
rm -f /etc/update-motd.d/51-wpnotice
rm -f /etc/update-motd.d/51-wpnotice-SITEname
#Remove script
while true; do

4
CoreModules/nginx/conf.sh
View File

@@ -37,8 +37,8 @@ curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModule
sed -i -e 's/DOMAINname/'$hostname'/g' /etc/nginx/sites-available/Backend_ssl
mkdir -p /opt/toggle
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-Netdata_NGINX.sh -O /opt/toggle/toggle-Netdata.sh
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-PhpMyAdmin_NGINX.sh -O /opt/toggle/toggle-PhpMyAdmin.sh
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-Netdata_NGINX.sh -o /opt/toggle/toggle-Netdata.sh
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-PhpMyAdmin_NGINX.sh -o /opt/toggle/toggle-PhpMyAdmin.sh
# custom Welcome page
echo "<html><head></head><body>$webserv is functioning normally</body></html>" > /usr/share/nginx/html/index.html

4
SubModules/postfix/conf.sh
View File

@@ -11,4 +11,6 @@ cat <<EOF > /etc/aliases
postmaster: root
root: $email
EOF
newaliases
newaliases
systemctl reload postfix postfix@-

9
SubModules/postfix/preconf.sh
View File

@@ -1,2 +1,11 @@
if [ -z "${domain}" ]; then
if [ $IMODE = n ]; then
domain=$(whiptail --nocancel --inputbox " Enter the domain without WWW " 11 82 --title "Config" 3>&1 1>&2 2>&3)
elif [ $IMODE = l ]; then
echo "Enter the domain without WWW:"
read domain
fi
fi
debconf-set-selections <<< "postfix postfix/mailname string $domain"
debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Internet Site'"

2
installer.sh
View File

@@ -700,7 +700,7 @@ fi
# Services #
##------------##
systemctl reload sshd fail2ban postfix postfix@-
systemctl reload sshd fail2ban
##-------##