From 7c8c89ae848bdc608bd7fc8175710367c2674acd Mon Sep 17 00:00:00 2001 From: "b.waal" Date: Wed, 11 Sep 2019 12:13:36 +0200 Subject: [PATCH] Update 'installer.sh' --- installer.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/installer.sh b/installer.sh index 2d979b1..8bad6ad 100644 --- a/installer.sh +++ b/installer.sh @@ -213,7 +213,6 @@ useradd -u 5000 -g vmail -s /usr/sbin/nologin -d /var/mail/vmail -m vmail ##--------------------## # Certbot (Auto) # ##--------------------## - add-apt-repository ppa:certbot/certbot -y apt install -y python-certbot-nginx certbot --nginx -n -d "$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos @@ -222,7 +221,7 @@ sed -i 's/ssl ipv6only/ssl http2 ipv6only/g' /etc/nginx/sites-available/"$domain sed -i 's/listen 443 ssl/listen 443 ssl http2/g' /etc/nginx/sites-available/"$domain" sed -i 's#include /etc/letsencrypt/options-ssl-nginx.conf;#ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;#g' /etc/nginx/sites-available/"$domain" openssl dhparam -out /etc/ssl/certs/dhparam.pem "$dhparam" -chmod 755 -R /etc/ssl/certs/dhparam.pem +chmod 777 -R /etc/ssl/certs/dhparam.pem ##----------------------## # Certbot (Manual) # @@ -231,9 +230,15 @@ chmod 755 -R /etc/ssl/certs/dhparam.pem #sed -i 's/ssl ipv6only/ssl http2 ipv6only/g' /etc/nginx/sites-available/"$domain" #sed -i 's/listen 443 ssl/listen 443 ssl http2/g' /etc/nginx/sites-available/"$domain" #sed -i 's#include /etc/letsencrypt/options-ssl-nginx.conf;#ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;#g' /etc/nginx/sites-available/"$domain" - +#wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/lets-encrypt/cert.pem -O /etc/letsencrypt/live/$domain/ +#wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/lets-encrypt/chain.pem -O /etc/letsencrypt/live/$domain/ +#wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/lets-encrypt/fullchain.pem -O /etc/letsencrypt/live/$domain/ +#wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/lets-encrypt/privkey.pem -O /etc/letsencrypt/live/$domain/ +#wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/nginx/site-enabled -O /etc/nginx/sites-available/mail.ictdownwerk.com #openssl dhparam -out /etc/ssl/certs/dhparam.pem "$dhparam" -#chmod 755 -R /etc/ssl/certs/dhparam.pem +#chmod 777 -R /etc/ssl/certs/dhparam.pem +#chmod 777 -R /etc/letsencrypt/live/$domain/cert.pem chain.pem fullchain.pem privkey.pem +#chmod 644 -R /etc/nginx/sites-available/mail.ictdownwerk.com ##-----------------------## # Postfix Installer # @@ -411,12 +416,12 @@ source /tmp/unattended.sh ##-----------------------## # Enabling Services # ##-----------------------## -systemctl enable mysql postfix postfix@- dovecot fail2ban clamav-daemon clamav-freshclam clamsmtp spamassassin amavisd-new amavisd-snmp-subagent amavis-mc amavis amavis-snmp-subagent +systemctl enable nginx mysql postfix postfix@- dovecot fail2ban clamav-daemon clamav-freshclam clamsmtp spamassassin amavisd-new amavisd-snmp-subagent amavis-mc amavis amavis-snmp-subagent ##-----------------------## # Starting Services # ##-----------------------## -systemctl restart mysql postfix postfix@- dovecot fail2ban clamav-daemon clamav-freshclam clamsmtp spamassassin amavisd-new amavisd-snmp-subagent amavis-mc amavis amavis-snmp-subagent +systemctl restart nginx mysql postfix postfix@- dovecot fail2ban clamav-daemon clamav-freshclam clamsmtp spamassassin amavisd-new amavisd-snmp-subagent amavis-mc amavis amavis-snmp-subagent ##------------------## # Final Update #