From c4370a17dec7c1090c92efc195f6bd1188ba9bde Mon Sep 17 00:00:00 2001
From: RATDAD <lambda@disroot.org>
Date: Sat, 14 Mar 2026 19:09:51 -0400
Subject: refactor: alter the position of environment files and container
 routing

---
 stacks/news/.gitignore       |  8 --------
 stacks/news/compose.yml      | 25 ++++++++++++-------------
 stacks/news/env.template     | 20 --------------------
 stacks/news/run.env.template | 32 --------------------------------
 4 files changed, 12 insertions(+), 73 deletions(-)
 delete mode 100644 stacks/news/.gitignore
 delete mode 100644 stacks/news/env.template
 delete mode 100644 stacks/news/run.env.template

(limited to 'stacks/news')

diff --git a/stacks/news/.gitignore b/stacks/news/.gitignore
deleted file mode 100644
index 01b11ab..0000000
--- a/stacks/news/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.env
-data/
-db/
-extensions/
-certs/
-compose.test.yml
-config.custom.php
-config-user.custom.php
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
diff --git a/stacks/news/env.template b/stacks/news/env.template
deleted file mode 100644
index 79e216b..0000000
--- a/stacks/news/env.template
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#
-# Stack Compose Variables
-
-# Namespaces
-STACK=
-
-# Containers
-NEWS_CONTAINER=
-
-# Network
-EDGE_NET=
-DB_NET=
-
-# Volumes
-# TODO: Manage Volumes that may be necessary for FreshRSS.
-
-# OIDC
-OIDC_PROVIDER_DOMAIN=
-PROXY_IP=
diff --git a/stacks/news/run.env.template b/stacks/news/run.env.template
deleted file mode 100644
index 44bfcde..0000000
--- a/stacks/news/run.env.template
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#
-# Stack Runtime Variables
-
-# DB
-POSTGRES_USER=
-POSTGRES_PASSWORD=
-DB_BASE=
-DB_HOST=
-
-# GENERAL
-TZ=
-CRON_MIN=2,32
-FRESHRSS_ENV=production
-LISTEN=0.0.0.0:80
-TRUSTED_PROXY=
-ADMIN_EMAIL=
-BASE_URL=
-SERVER_DNS=
-
-# OIDC
-OIDC_ENABLED=1
-OIDC_PROVIDER_METADATA_URL=
-OIDC_CLIENT_ID=
-OIDC_CLIENT_SECRET=
-OIDC_CLIENT_CRYPTO_KEY=
-OIDC_REMOTE_USER_CLAIM=
-OIDC_SCOPES=
-OIDC_X_FORWARDED_HEADERS=
-# OIDC_SESSION_INACTIVITY_TIMEOUT=
-# OIDC_SESSION_MAX_DURATION=
-# OIDC_SESSION_TYPE=
-- 
cgit v1.2.3-70-g09d2