From eaf2017a91fc396f1b4a6749baafeecd69d2c59e Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 25 Nov 2025 11:44:55 -0500
Subject: [PATCH] Shuffle environment variables

---
 .env.sample | 30 +++++++++++++++++++++++------
 compose.yml | 54 +++++++++++++++++++++++++++++++----------------------
 2 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/.env.sample b/.env.sample
index d210fa2..de23965 100644
--- a/.env.sample
+++ b/.env.sample
@@ -5,16 +5,34 @@ DOMAIN=levelfly.example.com
 #EXTRA_DOMAINS=', `www.levelfly.example.com`'
 LETS_ENCRYPT_ENV=production
 
-AWS_ACCESS_KEY_ID=ADD_ME
-AWS_SECRET_ACCESS_KEY=ADD_ME
+COMPOSE_FILE=compose.yml
+
+SUPPORT_EMAIL=test@example.com
+
+SECRET_KEY_BASE=GENERATE_ME
+
+# AWS S3 file storage
+S3_PROTOCOL=https
+S3_REGION=us-east-1
+S3_BUCKET=levelfly
+S3_ACCESS_KEY_ID=ADD_ME
+S3_SECRET_ACCESS_KEY=ADD_ME
+#S3_HOST_NAME=localhost:9090
+#S3_ENDPOINT=http://s3:9090
+#S3_FORCE_PATH_STYLE=true
+
+# Email
 SMTP_PASSWORD=ADD_ME
 SMTP_USERNAME=email@example.com
 SMTP_DOMAIN=ADD_ME
 SMTP_HOST=mail.example.com
 SMTP_PORT=587
+
+# Pusher
 PUSHER_SOCKET_URL=ws://ws.pusherapp.com/app/APP_ID
 PUSHER_URL=https://USER:PASS@api.pusherapp.com/apps/APP
-S3_KEY=ADD_ME
-S3_PATH=example.s3.amazonaws.com/example
-S3_SECRET=ADD_ME
-SUPPORT_EMAIL=test@example.com
+
+# Newrelic error logging
+NEW_RELIC_AGENT_ENABLED=false
+NEW_RELIC_LICENSE_KEY=ADD_ME
+NEW_RELIC_APP_NAME=levelfly
diff --git a/compose.yml b/compose.yml
index 98c7890..0140e1d 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,39 +1,49 @@
 ---
-version: "3.8"
-
 x-environment:
   &default-env
-   - DB_USER=levelfly
-   - DB_NAME=levelfly
-   - DB_PASSWORD=test
-   - DB_HOST=db
+   # Core settings 
    - APP_ENV=production
    - APP_NAME=levelfly
-   - AWS_ACCESS_KEY_ID
-   - AWS_SECRET_ACCESS_KEY
    - BUNDLE_WITHOUT=development:test
    - LANG=en_US.UTF-8
    - LOG_LEVEL=info
+   - RACK_ENV=production
+   - RAILS_ENV=production
+   - RAILS_LOG_TO_STDOUT=true
+   - RAILS_SERVE_STATIC_FILES=true
+   - SECRET_KEY_BASE
+   - DATABASE_HOST=${STACK_NAME}_db
+   - DATABASE_USERNAME=levelfly
+   - DATABASE_PASSWORD=levelfly
+   - DATABASE_PORT=5432
+   - DATABASE_NAME=levelfly
+   - PUSHER_SOCKET_URL
+   - PUSHER_URL
+   - SUPPORT_EMAIL
+   - URL=https://$DOMAIN
+   # Co-op Cloud specific
    - DOMAIN
+   # Email 
    - SMTP_HOST
    - SMTP_PORT
    - SMTP_USERNAME
    - SMTP_PASSWORD
    - SMTP_DOMAIN
-   - NEW_RELIC_LOG=stdout
-   - PUSHER_SOCKET_URL
-   - PUSHER_URL
-   - RACK_ENV=production
-   - RAILS_ENV=production
-   - S3_KEY
-   - S3_PATH
-   - S3_PROTOCOL=https
-   - S3_SECRET
-   - SUPPORT_EMAIL
-   - URL=https://$DOMAIN
    - MAILER_DEFAULT_URL=$DOMAIN
-   - RAILS_LOG_TO_STDOUT=true
-   - RAILS_SERVE_STATIC_FILES=true
+   # S3 file storage
+   - S3_PROTOCOL=https
+   - S3_REGION
+   - S3_BUCKET
+   - S3_ACCESS_KEY_ID
+   - S3_SECRET_ACCESS_KEY
+   - S3_HOST_NAME
+   - S3_ENDPOINT
+   - S3_FORCE_PATH_STYLE
+   # Newrelic error logging
+   - NEW_RELIC_LOG=stdout
+   - NEW_RELIC_AGENT_ENABLED=${NEW_RELIC_AGENT_ENABLED:-false}"
+   - NEW_RELIC_LICENSE_KEY
+   - NEW_RELIC_APP_NAME
 
 services:
   app:
@@ -78,7 +88,7 @@ services:
     environment: 
       POSTGRES_DB: levelfly
       POSTGRES_USER: levelfly
-      POSTGRES_PASSWORD: test
+      POSTGRES_PASSWORD: levelfly
     networks:
       - internal
     healthcheck: