diff --git a/.env.default b/.env.default index f34dfd5..2f6bd4d 100644 --- a/.env.default +++ b/.env.default @@ -1,6 +1,6 @@ # ssl -GANDIV5_API_KEY=xxxxxxxxxxxxxxxxx LETSENCRYPT_EMAIL=root@localhost.localdomain +LETSENCRYPT_GENERATE=false # sites DOMAIN=localhost.localdomain HOST_BAIKAL=baikal @@ -16,7 +16,6 @@ HOST_PORTAINER=portainer HOST_SEAFILE=seafile HOST_SELFOSS=selfoss HOST_SHAARLI=shaarli -HOST_TRAEFIK=traefik HOST_WALLABAG=wallabag HOST_WWW=www # other diff --git a/nginx-proxy/docker-compose.nginx-local.yml b/nginx-proxy/docker-compose.nginx-local.yml index 09a586c..09dd977 100755 --- a/nginx-proxy/docker-compose.nginx-local.yml +++ b/nginx-proxy/docker-compose.nginx-local.yml @@ -9,11 +9,31 @@ services: - 443:443 environment: - DEFAULT_HOST=${HOST_WWW}.${DOMAIN} - - DHPARAM_GENERATION=false + - DHPARAM_GENERATION=${LETSENCRYPT_GENERATE} networks: - srv volumes: - /var/run/docker.sock:/tmp/docker.sock:ro - ${ROOT_INSTALL}/data/nginx-proxy/certs:/etc/nginx/certs + - ${ROOT_INSTALL}/data/nginx-proxy/dhparam:/etc/nginx/dhparam:rw - ${ROOT_INSTALL}/data/nginx-proxy/vhost.d:/etc/nginx/vhost.d:ro - - ${ROOT_INSTALL}/data/nginx-proxy/htpasswd:/etc/nginx/htpasswd \ No newline at end of file + - ${ROOT_INSTALL}/data/nginx-proxy/htpasswd:/etc/nginx/htpasswd + + acme-companion: + image: nginxproxy/acme-companion + container_name: nginx-proxy-acme + environment: + - DEFAULT_EMAIL=${LETSENCRYPT_EMAIL} + volumes_from: + - nginx-proxy + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro + - ${ROOT_INSTALL}/data/nginx-proxy/certs:/etc/nginx/certs:rw + - acme:/etc/acme.sh + networks: + - srv + +volumes: + dhparam: + certs: + acme: \ No newline at end of file