From 7a1c3688c863d042b33d44788bb14ccd18e6bd2c Mon Sep 17 00:00:00 2001
From: Greg <gregman@livingonlinenow.com>
Date: Thu, 29 May 2025 16:03:08 +0200
Subject: [PATCH] refactor: simplify container setup by removing auth and
 making S3 backup optional

---
 nginx.conf       | 24 +++++++++++++++++++++++-
 supervisord.conf | 37 ++++++++++++-------------------------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/nginx.conf b/nginx.conf
index cd7bdfe..d0f970d 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,4 +1,25 @@
-server {
+user nginx;
+worker_processes auto;
+pid /var/run/nginx.pid;
+
+events {
+    worker_connections 768;
+}
+
+http {
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 65;
+    types_hash_max_size 2048;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+
+    # Logging Settings
+    access_log /dev/stdout;
+    error_log /dev/stderr warn;
+
+    server {
     listen 80;
     server_name localhost;
     root /usr/share/nginx/html;
@@ -43,3 +64,4 @@ server {
         root /usr/share/nginx/html;
     }
 }
+}
diff --git a/supervisord.conf b/supervisord.conf
index d8ff089..436ea45 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -5,19 +5,6 @@ logfile=/dev/stdout
 logfile_maxbytes=0
 pidfile=/var/run/supervisord.pid
 
-[program:generate-htpasswd]
-command=node /usr/share/nginx/api/generate-htpasswd.js
-directory=/usr/share/nginx/api
-environment=PASSWORD_HASH="%(ENV_PASSWORD_HASH)s",AUTH_USERNAME="%(ENV_AUTH_USERNAME)s",AUTH_PASSWORD="%(ENV_AUTH_PASSWORD)s"
-autostart=true
-autorestart=false
-startsecs=0
-startretries=1
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
 [program:nginx]
 command=nginx -g 'daemon off;'
 autostart=true
@@ -28,8 +15,8 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:data-api]
-command=node /usr/share/nginx/api/data-api.js
-directory=/usr/share/nginx/api
+command=node data-api.js
+directory=/app
 environment=DATA_DIR="/data",PORT="3000"
 autostart=true
 autorestart=true
@@ -38,13 +25,13 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
-[program:s3-backup]
-command=node /usr/share/nginx/api/backup-s3.js
-directory=/usr/share/nginx/api
-environment=DATA_PATH="/data/weight-tracker-data.json",S3_ENDPOINT="%(ENV_S3_ENDPOINT)s",S3_BUCKET="%(ENV_S3_BUCKET)s",S3_ACCESS_KEY="%(ENV_S3_ACCESS_KEY)s",S3_SECRET_KEY="%(ENV_S3_SECRET_KEY)s",BACKUP_SCHEDULE="%(ENV_BACKUP_SCHEDULE)s",BACKUP_RETENTION="%(ENV_BACKUP_RETENTION)s"
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
+;[program:s3-backup]
+;command=node backup-s3.js
+;directory=/app
+;environment=DATA_PATH="/data/weight-tracker-data.json",S3_ENDPOINT="%(ENV_S3_ENDPOINT)s",S3_BUCKET="%(ENV_S3_BUCKET)s",S3_ACCESS_KEY="%(ENV_S3_ACCESS_KEY)s",S3_SECRET_KEY="%(ENV_S3_SECRET_KEY)s",BACKUP_SCHEDULE="%(ENV_BACKUP_SCHEDULE)s",BACKUP_RETENTION="%(ENV_BACKUP_RETENTION)s"
+;autostart=true
+;autorestart=true
+;stdout_logfile=/dev/stdout
+;stdout_logfile_maxbytes=0
+;stderr_logfile=/dev/stderr
+;stderr_logfile_maxbytes=0