ソースを参照

Skip LE with configuration parameter

andryyy 8 年 前
コミット
2c3d649f0f
2 ファイル変更6 行追加3 行削除
  1. 2 3
      docker-compose.yml
  2. 4 0
      generate_config.sh

+ 2 - 3
docker-compose.yml

@@ -284,20 +284,19 @@ services:
     acme-mailcow:
     acme-mailcow:
       depends_on:
       depends_on:
         - nginx-mailcow
         - nginx-mailcow
-      image: mailcow/acme:1.0
+      image: mailcow/acme:1.1
       build: ./data/Dockerfiles/acme
       build: ./data/Dockerfiles/acme
       dns:
       dns:
         - 172.22.1.254
         - 172.22.1.254
       dns_search: mailcow-network
       dns_search: mailcow-network
-      # All domains to be included in the certificate
       environment:
       environment:
         - CONTAINERS_RESTART=mailcowdockerized_postfix-mailcow_1 mailcowdockerized_dovecot-mailcow_1 mailcowdockerized_nginx-mailcow_1
         - CONTAINERS_RESTART=mailcowdockerized_postfix-mailcow_1 mailcowdockerized_dovecot-mailcow_1 mailcowdockerized_nginx-mailcow_1
-        # Additional subject alternate names
         - ADDITIONAL_SAN=${ADDITIONAL_SAN}
         - ADDITIONAL_SAN=${ADDITIONAL_SAN}
         - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
         - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
         - DBNAME=${DBNAME}
         - DBNAME=${DBNAME}
         - DBUSER=${DBUSER}
         - DBUSER=${DBUSER}
         - DBPASS=${DBPASS}
         - DBPASS=${DBPASS}
+        - SKIP_LETS_ENCRYPT=${SKIP_LETS_ENCRYPT:-n}
       volumes:
       volumes:
         - ./data/web/.well-known/acme-challenge:/var/www/acme:rw
         - ./data/web/.well-known/acme-challenge:/var/www/acme:rw
         - ./data/assets/ssl:/var/lib/acme/:rw
         - ./data/assets/ssl:/var/lib/acme/:rw

+ 4 - 0
generate_config.sh

@@ -78,6 +78,10 @@ COMPOSE_PROJECT_NAME=mailcow-dockerized
 # Additional SAN for the certificate
 # Additional SAN for the certificate
 ADDITIONAL_SAN=
 ADDITIONAL_SAN=
 
 
+# To never run acme-mailcow for Let's Encrypt, set this to y
+SKIP_LETS_ENCRYPT=n
+
+
 EOF
 EOF
 
 
 mkdir -p data/assets/ssl
 mkdir -p data/assets/ssl