From c36989b5ed9bd90dbcf235a18e8c6648fa78ec24 Mon Sep 17 00:00:00 2001 From: Matthew Saunders Brown Date: Tue, 4 Feb 2025 14:57:00 -0800 Subject: [PATCH] add code to check for aliases and redirects --- sbin/letsencrypt-deploy.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sbin/letsencrypt-deploy.sh b/sbin/letsencrypt-deploy.sh index cb4e635..ebe30a8 100755 --- a/sbin/letsencrypt-deploy.sh +++ b/sbin/letsencrypt-deploy.sh @@ -16,17 +16,30 @@ if [[ -d /var/tmp/letsencrypt/ ]]; then do rm /var/tmp/letsencrypt/$domain if /usr/local/bin/letsencrypt-certonly.sh -d $domain ; then + # check for Mail domain if [[ "$domain" =~ ^mail.* ]]; then vmaildomain="${domain/mail./}" if [[ -d /var/vmail/$vmaildomain ]]; then /usr/local/bin/vmail-dovecot-enable.sh -d $vmaildomain /usr/local/bin/vhost-enable.sh -d $domain -m VMailHTTPS fi + # check for VHost elif [[ -d /srv/www/$domain ]]; then /usr/local/bin/vhost-enable.sh -d $domain -m VHostHTTPS + # check for configured VHostAliasHTTP, RedirectHTTP, VHostSubdomainHTTP + elif [[ -f /etc/apache2/sites-available/$domain.conf ]]; then + if head -n 1 /etc/apache2/sites-available/$domain.conf |grep --quiet "^Use .*HTTP "; then + sed -i "s|HTTP |HTTPS |g" /etc/apache2/sites-available/$domain.conf + if [[ -h /etc/apache2/sites-enabled/$domain.conf ]]; then + # modify timestamp on existing symlink to trigger apache restart + touch --no-dereference /etc/apache2/sites-enabled/$domain.conf + else + # Alias/Redirect/Subdomain site was configured but not enabled, enable now + a2ensite --quiet $domain.conf + fi + fi fi fi - # add code to check for aliases and redirects? # run once and exit, script will be restarted if additional domains are still queued for cert deployment exit 0 done