update nginx-proxy and letsencrypt service name variable

Author: evertramos

.env.sample

@@ -16,13 +16,13 @@
 # and the image version for each service, please note that if you use our script
 # we will replace the service name in docker-compose file with the container name
 #
-NGINX_WEB=proxy-web
+NGINX_WEB_SEVICE_NAME=proxy-web
 NGINX_IMAGE_VERSION=stable-alpine
 
 DOCKER_GEN_SEVICE_NAME=docker-gen
 DOCKER_GEN_IMAGE_VERSION=latest
 
-LETS_ENCRYPT=letsencrypt-companion
+LETS_ENCRYPT_SEVICE_NAME=letsencrypt-companion
 NGINX_PROXY_COMPANION_IMAGE_VERSION=2.0
 
 #-----------------------------------------------------------------------

bin/.env

@@ -57,4 +57,4 @@ REPLACE_LETSENCRYPT_SERVICE_NAME="nginx-proxy-automation-letsencrypt"
 #  md5 checksum for .env and docker-compose.yml files
 #
 MD5_SUM_DOCKER_COMPOSE=5a9db4ac1b6fb25d683b8ed9929a7c42
-MD5_SUM_ENV_SAMPLE=29b1e64f20482a5a78416b7993f6d670
+MD5_SUM_ENV_SAMPLE=a24f8b55bc691fce5d1c49d89c5389ad

bin/localscript/update-env-new-site-variables.sh

@@ -34,11 +34,11 @@ local_update_env_new_site_variables()
     [[ "$DEBUG" == true ]] && echo "Updating all variables in .env file for nginx-proxy (file: ${LOCAL_FILE_PATH})"
 
     # Docker servides and image versions
-    run_function env_update_variable $LOCAL_FILE_PATH "NGINX_WEB" "$NGINX_PROXY_SERVICE_NAME"
+    run_function env_update_variable $LOCAL_FILE_PATH "NGINX_WEB_SEVICE_NAME" "$NGINX_PROXY_SERVICE_NAME"
     run_function env_update_variable $LOCAL_FILE_PATH "NGINX_IMAGE_VERSION" "$NGINX_PROXY_IMAGE_VERSION"
     run_function env_update_variable $LOCAL_FILE_PATH "DOCKER_GEN_SEVICE_NAME" "$DOCKER_GEN_SERVICE_NAME"
     run_function env_update_variable $LOCAL_FILE_PATH "DOCKER_GEN_IMAGE_VERSION" "$DOCKER_GEN_IMAGE_VERSION"
-    run_function env_update_variable $LOCAL_FILE_PATH "LETS_ENCRYPT" "$LETSENCRYPT_SERVICE_NAME"
+    run_function env_update_variable $LOCAL_FILE_PATH "LETS_ENCRYPT_SEVICE_NAME" "$LETSENCRYPT_SERVICE_NAME"
     run_function env_update_variable $LOCAL_FILE_PATH "NGINX_PROXY_COMPANION_IMAGE_VERSION" "$LETSENCRYPT_IMAGE_VERSION"
 
     # IPs

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     image: nginx:${NGINX_IMAGE_VERSION:-stable-alpine}
     labels:
         com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
-    container_name: ${NGINX_WEB:-nginx-proxy-automation-web}
+    container_name: ${NGINX_WEB_SEVICE_NAME:-nginx-proxy-automation-web}
     restart: always
     ports:
       - "${IPv4:-0.0.0.0}:${DOCKER_HTTP:-80}:80"
@@ -28,7 +28,7 @@ services:
 
   nginx-proxy-automation-gen:
     image: jwilder/docker-gen:${DOCKER_GEN_IMAGE_VERSION:-latest}
-    command: -notify-sighup ${NGINX_WEB:-nginx-proxy-automation-web} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
+    command: -notify-sighup ${NGINX_WEB_SEVICE_NAME:-nginx-proxy-automation-web} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
     container_name: ${DOCKER_GEN_SEVICE_NAME:-nginx-proxy-automation-gen}
     restart: always
     volumes:
@@ -47,7 +47,7 @@ services:
 
   nginx-proxy-automation-letsencrypt:
     image: jrcs/letsencrypt-nginx-proxy-companion:${NGINX_PROXY_COMPANION_IMAGE_VERSION:-2.0}
-    container_name: ${LETS_ENCRYPT:-nginx-proxy-automation-letsencrypt}
+    container_name: ${LETS_ENCRYPT_SEVICE_NAME:-nginx-proxy-automation-letsencrypt}
     restart: always
     volumes:
       - ${NGINX_FILES_PATH:-./data}/conf.d:/etc/nginx/conf.d
@@ -58,7 +58,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
       NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN_SEVICE_NAME:-nginx-proxy-automation-gen}
-      NGINX_PROXY_CONTAINER: ${NGINX_WEB:-nginx-proxy-automation-web}
+      NGINX_PROXY_CONTAINER: ${NGINX_WEB_SEVICE_NAME:-nginx-proxy-automation-web}
       DEFAULT_EMAIL: ${DEFAULT_EMAIL:[email protected]}
     logging:
       driver: ${NGINX_LETSENCRYPT_LOG_DRIVER:-json-file}