fixed port mappings placement given inherited container service networks; added environment file for gist service

dependent/compose.yml

@@ -26,8 +26,8 @@ secrets:
     file: ~/.podsecrets/redis.pass
   aria.token:
     file: ~/.podsecrets/aria.token
-  opengist.secret:
-    file: ~/.podsecrets/opengist.secret
+  # opengist.secret:
+  #   file: ~/.podsecrets/opengist.secret
 
 services:
   # @NOTE https://oneuptime.com/blog/post/2026-03-18-use-podman-containers-wireguard-vpn/view
@@ -49,6 +49,13 @@ services:
     hostname: wgnet
     ports:
       - 51820:51820/udp
+      - 80:80
+      - 443:443
+      - 443:443/udp
+      - 6379:6379
+      - 3306:3306
+      - ${FORGEJO_SSH_PORT:-2121}:${FORGEJO_SSH_PORT:-2121}
+      - ${OG_SSH_PORT:-2323}:${OG_SSH_PORT:-2323}
     sysctls:
       - net.ipv4.ip_forward=1
       - net.ipv4.conf.all.src_valid_mark=1
@@ -59,6 +66,8 @@ services:
       PGID: $(whoami | id -g)
     env_file:
       - ${HOME}/.all.env
+      - ${HOME}/.forgejo.env
+      - ${HOME}/.opengist.env
     labels:
       glance.name: Wireguard
       glance.id: wireguard
@@ -72,8 +81,8 @@ services:
     image: redis:trixie
     container_name: cache0
     restart: unless-stopped
-    ports:
-      - 6379:6379
+    expose:
+      - 6379
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - "redis-data:/data:z"
@@ -97,8 +106,8 @@ services:
     image: mysql:lts
     container_name: db0
     restart: unless-stopped
-    ports:
-      - 3306:3306
+    expose:
+      - 3306
     volumes:
       - /etc/localtime:/etc/localtime:ro
       # @TODO use Ansible to adjust/edit configuration below
@@ -296,6 +305,7 @@ services:
     #   - wgclient
     env_file:
       - ${HOME}/.all.env
+      - ${HOME}/.opengist.env
       - ${HOME}/.mysql.env
     environment:
       OG_OPENGIST_HOME: /opengist
@@ -304,11 +314,11 @@ services:
       OG_HTTP_GIT_ENABLED: true
       OG_EXTERNAL_URL: "${SERVER_FQDN_SCHEME}://${OG_SUBDOMAIN}.${SERVER_FQDN}"
       OG_CUSTOM_NAME: ${OG_NAME}
-      OG_CUSTOM_LOGO: ${OG_LOGO:-logo.svg}
-      OG_CUSTOM_FAVICON: ${OG_FAVICON:-logo.ico}
+      # OG_CUSTOM_LOGO: ${OG_LOGO:-logo.svg}
+      # OG_CUSTOM_FAVICON: ${OG_FAVICON:-logo.ico}
     secrets:
       - "user-mysql.pass"
-      - opengist.secret
+      # - opengist.secret
     labels:
       glance.name: OpenGist
       glance.id: opengist
@@ -325,10 +335,10 @@ services:
     cap_add:
       - NET_ADMIN
     restart: unless-stopped
-    ports:
-      - 80:80
-      - 443:443
-      - 443:443/udp
+    expose:
+      - 80
+      - 443
+      - 443/udp
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ~/.config/caddy:/etc/caddy:Z
@@ -396,6 +406,16 @@ services:
     restart: unless-stopped
     devices:
       - /dev/net/tun:/dev/net/tun
+    ports:
+      - 8080:8080
+      - 1700:1700
+      - 6800:6800
+      - 6940:6940
+      - 6940:6940/udp
+      - 6880:6880
+      - 5050:5050
+      - 5030:5030
+      - 50300:50300
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /lib/modules:/lib/modules:ro
@@ -444,8 +464,8 @@ services:
     image: ghcr.io/surgedm/surge
     container_name: surge
     restart: unless-stopped
-    ports:
-      - 1700:1700
+    expose:
+      - 1700
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ~/downloads:/downloads:z
@@ -503,8 +523,8 @@ services:
     image: p3terx/ariang:latest
     container_name: ariang
     restart: unless-stopped
-    ports:
-      - 6880:6880
+    expose:
+      - 6880
     networks:
       - hs
     # depends_on:
@@ -520,8 +540,8 @@ services:
   flexget:
     image: flexget/flexget
     container_name: flexget
-    ports:
-      - 5050:5050
+    expose:
+      - 5050
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ~/.flexget:/config:Z
@@ -546,9 +566,9 @@ services:
     image: slskd/slskd:latest
     container_name: soulseek
     restart: unless-stopped
-    ports:
-      - 5030:5030
-      - 50300:50300
+    expose:
+      - 5030
+      - 50300
     networks:
       - hs
     # depends_on: