Added support for multiple SSL domains

dlareau · Apr 23, 2020 · 953c016 · 953c016
1 parent 45fb825
commit 953c016
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -80,6 +80,7 @@ services:
       - media:/media
     environment:
       - DOMAIN
+      - SSL_DOMAINS
       - CONTACT_EMAIL
     tty: true
 

diff --git a/docker/apacheShibForeground b/docker/apacheShibForeground
@@ -9,12 +9,12 @@ chown _shibd:_shibd /etc/shibboleth/sp-*
 echo "Starting shibd"
 service shibd start
 echo "Finished starting shibd"
-if [ "$(ls -A /etc/letsencrypt/live)" ]; then
-    echo "Found existing certificate, not running certbot and assuming ssl is already enabled."
-else
+#if [ "$(ls -A /etc/letsencrypt/live)" ]; then
+#    echo "Found existing certificate, not running certbot and assuming ssl is already enabled."
+#else
     #    certbot --apache -n --agree-tos --staging --email $CONTACT_EMAIL --domains $DOMAIN
-    certbot --apache -n --agree-tos --email $CONTACT_EMAIL --domains $DOMAIN
-fi
+    certbot --apache -n --agree-tos --email $CONTACT_EMAIL --domains $SSL_DOMAINS --expand
+#fi
 a2enmod ssl
 service apache2 stop