refactor: alter the position of environment files and container routingdev

1 files changed, 12 insertions, 13 deletions

diff --git a/stacks/news/compose.yml b/stacks/news/compose.yml
index 65a7847..d5feb83 100644
--- a/stacks/news/compose.yml
+++ b/stacks/news/compose.yml
@@ -1,30 +1,29 @@
-## Template compose used for each stack.
-name: ${STACK} # Explicit project name (do not rely on directory name)
-
 networks:
-  edge-net:
+  edge_net:
     name: ${EDGE_NET}
     external: true # All networks MUST be external in production.
-  db-net:
+  db_net:
     name: ${DB_NET}
     external: true
 
 services:
-  news-test:
-    container_name: ${NEWS_CONTAINER} # Explicitly name containers.
+  news:
     image: freshrss/freshrss:latest
     restart: unless-stopped
+    environment:
+      FRESHRSS_ENV: production
+      LISTEN: 0.0.0.0:80
+      CRON_MIN: 2,32
     env_file:
-      # NOTE: .compose.env WILL override .env if there are overlapping values.
-      - .run.env # Compose wiring defaults go here
-      - .env # Service env vars
+      - ${ROOT}/stacks/.env # GLOBAL
+      - ${ROOT}/secret/env/news.env
     networks:
-      - edge-net
-      - db-net
+      - edge_net
+      - db_net
     expose:
       - 80
     extra_hosts:
-      - "${OIDC_PROVIDER_DOMAIN}:${PROXY_IP}" # This is required so the container can return the right uri after auth.
+      - "${OIDC_PROVIDER_URL}:${PROXY_IP}" # This is required so the container can return the right uri after auth.
     healthcheck:
       test: ["CMD", "cli/health.php"]
       timeout: 10s