tweaks

padhi-homelab · Jan 20, 2025 · dce1eef · dce1eef
1 parent 8e7f3b6
commit dce1eef
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/certbot/docker-compose.yml b/certbot/docker-compose.yml
@@ -20,7 +20,7 @@ services:
     environment:
       CERTBOT_EMAIL: ${SERVER_LETS_ENCRYPT_ACME_EMAIL:?}
       CERTBOT_DOMAIN: ${SERVER_WAN_FQDN:?}
-      CERTBOT_EXTRA_FLAGS: ${CERTBOT_EXTRA_FLAGS}
+      CERTBOT_EXTRA_FLAGS:
       TZ: ${TZ:?}
 
     healthcheck:

diff --git a/comp b/comp
@@ -102,19 +102,19 @@ __gen_env () {
 
   printf "[*] Generating '.env':"
   cp "$SELF_DIR/static.global.env" .env || return 1
+  __append_env_from "$SELF_DIR/dynamic.global.env.sh" || return 1
+
   if [ "$FLAG_SKIP_OVERRIDES" != yes ] && [ -f "$SELF_DIR/static.global.override.env" ] ; then
     cat "$SELF_DIR/static.global.override.env" >> .env || return 1
   fi
-
-  __append_env_from "$SELF_DIR/dynamic.global.env.sh" || return 1
   [ "$FLAG_SKIP_OVERRIDES" = yes ] || \
     __append_env_from "$SELF_DIR/dynamic.global.override.env.sh" || return 1
 
   [ ! -f static.env ] || cat static.env >> .env || return 1
+  __append_env_from "./dynamic.env.sh" || return 1
+
   [ "$FLAG_SKIP_OVERRIDES" = yes ] || \
     [ ! -f static.override.env ] || cat static.override.env >> .env || return 1
-
-  __append_env_from "./dynamic.env.sh" || return 1
   [ "$FLAG_SKIP_OVERRIDES" = yes ] || \
     __append_env_from "./dynamic.override.env.sh" || return 1
 

diff --git a/docker_sock/docker-compose.labels.yml b/docker_sock/docker-compose.labels.yml
@@ -6,4 +6,4 @@ services:
       traefik.http.services.docker_sock.loadBalancer.server.port: 9000
       #
       traefik.http.routers.docker_sock.rule: Host(`${SERVER_LAN_FQDN:?}`) && PathPrefix(`/docker_sock`)
-      traefik.http.routers.docker_sock.entryPoints: lan-https-b
+      traefik.http.routers.docker_sock.entryPoints: lan-internal
diff --git a/static.global.env b/static.global.env
@@ -5,7 +5,7 @@ POSTGRES_VERSION=17.2-alpine
 VALKEY_VERSION=8.0.2-alpine
 
 
-SERVER_LAN_BINDING_IP=127.0.0.1
+SERVER_LAN_BINDING_IP=0.0.0.0
 SERVER_LAN_FQDN=localhost
 
 SERVER_LAN_HTTP_PORT_A=4080
@@ -17,7 +17,7 @@ SERVER_LAN_HTTPS_PORT_B=9443
 SERVER_LETS_ENCRYPT_ACME_EMAIL=[email protected]
 SERVER_LETS_ENCRYPT_ACME_CA_SERVER_USE_STAGING=YES
 
-SERVER_WAN_BINDING_IP=127.0.0.1
+SERVER_WAN_BINDING_IP=0.0.0.0
 SERVER_WAN_FQDN=localhost
 
 SERVER_WAN_HTTPS_PORT=443