diff --git a/installer.sh b/installer.sh index f2ad2e5..4acaced 100644 --- a/installer.sh +++ b/installer.sh @@ -16,7 +16,7 @@ echo "Ubuntu 18.04 VestaCP install" echo "Welk domein (zonder WWW) mag gekoppeld worden?" read domain echo "Algemeen wachtwoord" -read passwd +read password echo "Administrator email" read email echo "Webserver:" @@ -110,34 +110,34 @@ while true; do done cd /tmp -curl -O http://vestacp.com/pub/vst-install.sh -bash vst-install.sh -f "$webserver" --named no --remi yes "$ftp" --iptables yes --fail2ban yes --quota no "$mail" --softaculous no --mysql yes --postgresql no --hostname "$domain" --email "$email" --password "$passwd" --interactive yes +wget http://vestacp.com/pub/vst-install.sh +bash vst-install.sh -f "$webserver" --named no --remi yes "$ftp" --iptables yes --fail2ban yes --quota no "$mail" --softaculous no --mysql yes --postgresql no --hostname "$domain" --email "$email" --password "$password" --interactive yes ##-------------## # Certbot # ##-------------## -case $webserver in - "NGINX+PHP-FPM") - certbot --nginx -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos - 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" - break;; - "NGINX+apache") - certbot --nginx -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos - 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" - break;; - "Apache") - certbot --apache -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos - break;; -esac +#case $webserver in +# "NGINX+PHP-FPM") +# certbot --nginx -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos +# 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" +# break;; +# "NGINX+apache") +# certbot --nginx -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos +# 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" +# break;; +# "Apache") +# certbot --apache -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos +# break;; +#esac cp /etc/letsencrypt/live/"$domain"/cert.pem /usr/local/vesta/ssl/certificate.crt cp /etc/letsencrypt/live/"$domain"/privkey.pem /usr/local/vesta/ssl/certificate.key -service vesta restart +systemctl restart vesta ##-------------## # Netdata #