- switch to using single ssl cert for all domains

dockerfiles/services/letsencrypt/docker-compose-install.yml

@@ -0,0 +1,47 @@
+---
+# docker-compose file for letsencrypt cert management
+
+# DOCKER_HOST=dkhost01:2376 docker-compose up updates
+
+# DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose-install.yml services_letsencrypt
+
+version: '3'
+services:
+
+  updates:
+    image: "blacklabelops/letsencrypt"
+    ports:
+      - 83:80
+#      - 443:443
+    volumes:
+      - /opt/shared/letsencrypt:/etc/letsencrypt
+    environment:
+      LETSENCRYPT_EMAIL: r_morgan@sympatico.ca
+      LETSENCRYPT_HTTPS_ENABLED: "false"
+      LETSENCRYPT_TESTCERT: "false"
+      LETSENCRYPT_DEBUG: "true"
+      LETSENCRYPT_JOB_TIME: "0 0 1 15 * *"
+      LETSENCRYPT_DOMAIN1: xai-corp.net
+      LETSENCRYPT_DOMAIN2: git.xai-corp.net
+      LETSENCRYPT_DOMAIN3: xaibox.xai-corp.net
+      LETSENCRYPT_DOMAIN4: dkui.xai-corp.net
+      LETSENCRYPT_DOMAIN5: dkregistry.xai-corp.net
+      LETSENCRYPT_DOMAIN6: fs.xai-corp.net
+      LETSENCRYPT_DOMAIN7: jenkins.xai-corp.net
+      LETSENCRYPT_DOMAIN8: sql.xai-corp.net
+      LETSENCRYPT_DOMAIN9: office.xai-corp.net
+      LETSENCRYPT_DOMAIN10: www.xai-corp.net
+      LETSENCRYPT_DOMAIN11: mail.xai-corp.net
+    command:
+      - install
+      - --expand
+
+    deploy:
+      mode: replicated
+      replicas: 1
+      restart_policy:
+        condition: none
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 256M

dockerfiles/services/letsencrypt/docker-compose-update.yml

@@ -10,16 +10,15 @@ services:
 
   updates:
     image: "blacklabelops/letsencrypt"
-    container_name: letsencrypt_staging_updates
     ports:
-      - 80:80
+      - 83:80
 #      - 443:443
     volumes:
       - /opt/shared/letsencrypt:/etc/letsencrypt
     environment:
       LETSENCRYPT_EMAIL: r_morgan@sympatico.ca
       LETSENCRYPT_HTTPS_ENABLED: "false"
-      LETSENCRYPT_TESTCERT: "true"
+      LETSENCRYPT_TESTCERT: "false"
       LETSENCRYPT_DEBUG: "true"
       LETSENCRYPT_JOB_TIME: "0 0 1 15 * *"
       LETSENCRYPT_DOMAIN1: xai-corp.net
@@ -31,10 +30,8 @@ services:
       LETSENCRYPT_DOMAIN7: jenkins.xai-corp.net
       LETSENCRYPT_DOMAIN8: sql.xai-corp.net
       LETSENCRYPT_DOMAIN9: office.xai-corp.net
-      LETSENCRYPT_DOMAIN9: www.xai-corp.net
-    command:
-      - install
-      - --expand
+      LETSENCRYPT_DOMAIN10: www.xai-corp.net
+      LETSENCRYPT_DOMAIN11: mail.xai-corp.net
 
     deploy:
       mode: replicated
@@ -43,5 +40,5 @@ services:
         condition: none
       resources:
         limits:
-          cpus: '0.1'
-          memory: 256M
+          cpus: '0.5'
+          memory: 16M

dockerfiles/services/letsencrypt/readme.md

@@ -9,7 +9,7 @@ todo: set this up as a cron
 #install new certs
 ```
 DOCKER_HOST=dkhost01:2376 docker run -d \
-    -p 80:80 \
+    -p 83:80 \
     --name letsencrypt \
     -e "LETSENCRYPT_HTTPS_ENABLED=false" \
     -v /opt/shared/letsencrypt-2:/etc/letsencrypt \
@@ -29,7 +29,7 @@ DOCKER_HOST=dkhost01:2376 docker run -d \
 
 ```
 DOCKER_HOST=dkhost01:2376 docker run -d \
-    -p 80:80 \
+    -p 83:80 \
     --name letsencrypt_updates \
     -e "LETSENCRYPT_HTTPS_ENABLED=false" \
     -v /opt/shared/letsencrypt-2:/etc/letsencrypt \
@@ -43,6 +43,6 @@ DOCKER_HOST=dkhost01:2376 docker run -d \
     -e "LETSENCRYPT_DOMAIN7=jenkins.xai-corp.net" \
     -e "LETSENCRYPT_DOMAIN8=sql.xai-corp.net" \
     -e "LETSENCRYPT_DOMAIN9=www.xai-corp.net" \
-    -e "LETSENCRYPT_DOMAIN90=office.xai-corp.net" \
+    -e "LETSENCRYPT_DOMAIN10=office.xai-corp.net" \
     blacklabelops/letsencrypt
 ```