refactor: simplify container setup by removing auth and making S3 backup optional

This commit is contained in:
Greg 2025-05-29 16:03:08 +02:00
parent ff0799603a
commit 7a1c3688c8
2 changed files with 35 additions and 26 deletions

View File

@ -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; listen 80;
server_name localhost; server_name localhost;
root /usr/share/nginx/html; root /usr/share/nginx/html;
@ -43,3 +64,4 @@ server {
root /usr/share/nginx/html; root /usr/share/nginx/html;
} }
} }
}

View File

@ -5,19 +5,6 @@ logfile=/dev/stdout
logfile_maxbytes=0 logfile_maxbytes=0
pidfile=/var/run/supervisord.pid 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] [program:nginx]
command=nginx -g 'daemon off;' command=nginx -g 'daemon off;'
autostart=true autostart=true
@ -28,8 +15,8 @@ stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
[program:data-api] [program:data-api]
command=node /usr/share/nginx/api/data-api.js command=node data-api.js
directory=/usr/share/nginx/api directory=/app
environment=DATA_DIR="/data",PORT="3000" environment=DATA_DIR="/data",PORT="3000"
autostart=true autostart=true
autorestart=true autorestart=true
@ -38,13 +25,13 @@ stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
[program:s3-backup] ;[program:s3-backup]
command=node /usr/share/nginx/api/backup-s3.js ;command=node backup-s3.js
directory=/usr/share/nginx/api ;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" ;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 ;autostart=true
autorestart=true ;autorestart=true
stdout_logfile=/dev/stdout ;stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 ;stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr ;stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 ;stderr_logfile_maxbytes=0