feat: log level

.env.sample

@@ -57,12 +57,4 @@ COMPOSE_FILE="compose.yml"
 # Only present in config.json (no equivalent env var):
 # DOCUMENT_MAX_LENGTH=100000
 # CMD_ENABLE_UPLOADS=registered
-
-# S3 uploads
-#COMPOSE_FILE="$COMPOSE_FILE:compose.s3.yml"
-#CMD_S3_ACCESS_KEY_ID=
-#CMD_S3_REGION=garage
-#CMD_S3_BUCKET=$DOMAIN
-#CMD_S3_ENDPOINT=
-#CMD_S3_FOLDER=uploads
-#SECRET_S3_SECRET_ACCESS_KEY_VERSION=v1
+# CMD_LOGLEVEL=info

abra.sh

@@ -1,3 +1,3 @@
-export ENTRYPOINT_CONF_VERSION=v14
+export ENTRYPOINT_CONF_VERSION=v13
 export CONFIG_JSON_VERSION=v1
 export PG_BACKUP_VERSION=v1

compose.s3.yml

@@ -1,17 +0,0 @@
----
-version: "3.8"
-services:
-  app:
-    environment:
-      - CMD_S3_ACCESS_KEY_ID
-      - CMD_S3_REGION
-      - CMD_S3_BUCKET
-      - CMD_S3_ENDPOINT
-      - CMD_S3_FOLDER
-      - CMD_S3_PUBLIC_FILES=false
-    secrets:
-      - s3_secret_access_key
-secrets:
-  s3_secret_access_key:
-    external: true
-    name: ${STACK_NAME}_s3_secret_access_key_${SECRET_S3_SECRET_ACCESS_KEY_VERSION}

compose.yml

@@ -27,6 +27,7 @@ services:
       - CMD_SESSION_SECRET_FILE=/run/secrets/session_secret
       - DOCUMENT_MAX_LENGTH
       - CMD_ENABLE_UPLOADS
+      - CMD_LOGLEVEL=${CMD_LOGLEVEL:-info}
     networks:
       - proxy
     volumes:

entrypoint.sh.tmpl

@@ -27,7 +27,6 @@ load_vars() {
   fi
   file_env "CMD_OAUTH2_CLIENT_SECRET"
   file_env "CMD_SESSION_SECRET"
-  file_env "CMD_S3_SECRET_ACCESS_KEY"
 }
 
 main() {