Fixed branch variables & added msg to MOTD and ufw

This commit is contained in:
b.waal
2019-10-08 11:53:33 +02:00
parent 32b54ef871
commit faa9a90268

View File

@@ -84,9 +84,6 @@ sed -i '/Port 22/c\Port 4242' /etc/ssh/sshd_config
hostnamectl set-hostname $domain > $OUTPUT 2>&1 hostnamectl set-hostname $domain > $OUTPUT 2>&1
timedatectl set-timezone Europe/Amsterdam > $OUTPUT 2>&1 timedatectl set-timezone Europe/Amsterdam > $OUTPUT 2>&1
hostname --fqdn > /etc/mailname hostname --fqdn > /etc/mailname
#mkdir -p /var/run/clamav
#adduser --system --no-create-home --disabled-password --disabled-login --shell /bin/false --group --home /var/lib/clamav clamav
#chown clamav:clamav /var/run/clamav
mkdir -p /etc/nginx mkdir -p /etc/nginx
mkdir -p /var/www/"$domain"/html mkdir -p /var/www/"$domain"/html
chmod -R 755 /var/www chmod -R 755 /var/www
@@ -411,19 +408,25 @@ source /tmp/unattended.sh
##--------------------------------------## ##--------------------------------------##
# Clearing / purging the mail queue # # Clearing / purging the mail queue #
##--------------------------------------## ##--------------------------------------##
wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/beta/config/postfix/clear-queue.sh -O /tmp/clear-queue.sh msg " Configuring Mail-queue"
sleep 2
wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/postfix/clear-queue.sh -O /tmp/clear-queue.sh
source /tmp/clear-queue.sh source /tmp/clear-queue.sh
##----------## ##----------##
# Motd # # MOTD #
##----------## ##----------##
wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/"$branch"/beta/config/motd/01-custom -O /etc/update-motd.d/01-custom msg " Configuring MOTD"
sleep 2
wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/motd/01-custom -O /etc/update-motd.d/01-custom
chmod +x /etc/update-motd.d/01-custom chmod +x /etc/update-motd.d/01-custom
##---------## ##---------##
# Ufw # # Ufw #
##---------## ##---------##
wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/beta/config/ufw/config.sh -O /tmp/ufw-config.sh msg " Configuring ufw"
sleep 2
wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/ufw/config.sh -O /tmp/ufw-config.sh
source /tmp/ufw-config.sh source /tmp/ufw-config.sh
##---------------------## ##---------------------##