diff --git a/menu.sh b/menu.sh index 8d02119..55313b1 100644 --- a/menu.sh +++ b/menu.sh @@ -7,7 +7,7 @@ source /etc/functions.sh -RESULT=$(dialog --stdout --default-item 1 --title "Ultimate Crypto-Server Setup Installer v1.91" --menu "Choose one" -1 60 6 \ +RESULT=$(dialog --stdout --default-item 1 --title "Ultimate Crypto-Server Setup Installer v1.92" --menu "Choose one" -1 60 6 \ ' ' "- For small private pools -" \ 1 "YiiMP - Single Server" \ ' ' "- If you plan on adding more servers later -" \ diff --git a/nginx_domain_ssl.sh b/nginx_domain_ssl.sh index c13618b..d5e7717 100644 --- a/nginx_domain_ssl.sh +++ b/nginx_domain_ssl.sh @@ -24,7 +24,6 @@ echo -e " Generating Certbot Request for ${DomainName} ...$COL_RESET" sudo mkdir -p /var/www/_letsencrypt sudo chown www-data /var/www/_letsencrypt hide_output sudo certbot certonly --webroot -d "${DomainName}" --register-unsafely-without-email -w /var/www/_letsencrypt -n --agree-tos --force-renewal -wait $! # Check to make sure certbot installed ok, if not keep the self generated ssl config. if sudo [ -f /etc/letsencrypt/live/"$DomainName"/fullchain.pem ]; then # Configure Certbot to reload NGINX after success renew: diff --git a/nginx_subdomain_ssl.sh b/nginx_subdomain_ssl.sh index 0c6b032..d5e7717 100644 --- a/nginx_subdomain_ssl.sh +++ b/nginx_subdomain_ssl.sh @@ -24,9 +24,8 @@ echo -e " Generating Certbot Request for ${DomainName} ...$COL_RESET" sudo mkdir -p /var/www/_letsencrypt sudo chown www-data /var/www/_letsencrypt hide_output sudo certbot certonly --webroot -d "${DomainName}" --register-unsafely-without-email -w /var/www/_letsencrypt -n --agree-tos --force-renewal -wait $! # Check to make sure certbot installed ok, if not keep the self generated ssl config. -if sudo [ -f /etc/letsencrypt/live/"${DomainName}"/fullchain.pem ]; then +if sudo [ -f /etc/letsencrypt/live/"$DomainName"/fullchain.pem ]; then # Configure Certbot to reload NGINX after success renew: sudo mkdir -p /etc/letsencrypt/renewal-hooks/post/ echo '#!/bin/bash\nnginx -t && systemctl reload nginx' | sudo -E tee /etc/letsencrypt/renewal-hooks/post/nginx-reload.sh >/dev/null 2>&1 diff --git a/send_mail.sh b/send_mail.sh index e5e6c04..f08cd32 100644 --- a/send_mail.sh +++ b/send_mail.sh @@ -28,8 +28,10 @@ sudo debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Intern apt_install mailutils sudo sed -i 's/inet_interfaces = all/inet_interfaces = loopback-only/g' /etc/postfix/main.cf +sudo sed -i 's/myhostname =/# myhostname =/g' /etc/postfix/main.cf sudo sed -i 's/mydestination/# mydestination/g' /etc/postfix/main.cf -sudo sed -i '/# mydestination/i mydestination = $myhostname, localhost.$mydomain, $mydomain' /etc/postfix/main.cf +sudo sed -i '/# mydestination/i mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain' /etc/postfix/main.cf +sudo sed -i '/# myhostname =/i myhostname = localhost' /etc/postfix/main.cf sudo systemctl restart postfix whoami=`whoami`