diff --git a/modules/baserow/module.json b/modules/baserow/module.json index 6fc1e0b..bf8a057 100644 --- a/modules/baserow/module.json +++ b/modules/baserow/module.json @@ -6,7 +6,6 @@ ], "requires": [ "postgres-database", - "redis-cache", "route" ], "contributes": { @@ -20,12 +19,10 @@ }, "binds": { "postgres-database": "/var/lib/baserow/database.json", - "redis-cache": "/var/lib/baserow/redis.json", "route": "/var/lib/baserow/route.json" }, "secrets": { - "postgres-database": "/var/lib/baserow/database.secret", - "redis-cache": "/var/lib/baserow/redis.secret" + "postgres-database": "/var/lib/baserow/database.secret" }, "own-secrets": { "secret-key": "/var/lib/baserow/secret-key.secret", @@ -56,7 +53,7 @@ "id": "data", "type": "directory", "path": "/services/baserow/data", - "mode": "0700", + "mode": "0755", "owner": "9999:9999" }, { @@ -64,7 +61,7 @@ "type": "file", "path": "/var/lib/baserow/server.env", "mode": "0600", - "content": "DATABASE_HOST=${bound:postgres-database:at}\nDATABASE_PORT=${bound:postgres-database:port}\nDATABASE_NAME=${bound:postgres-database:as}\nDATABASE_USER=${bound:postgres-database:as}\nDATABASE_PASSWORD=${secret:postgres-database}\nREDIS_HOST=${bound:redis-cache:at}\nREDIS_PORT=${bound:redis-cache:port}\nREDIS_PROTOCOL=redis\nREDIS_PASSWORD=${secret:redis-cache}\nSECRET_KEY=${secret:secret-key}\nBASEROW_PUBLIC_URL=http://localhost\n" + "content": "DATABASE_HOST=${bound:postgres-database:at}\nDATABASE_PORT=${bound:postgres-database:port}\nDATABASE_NAME=${bound:postgres-database:as}\nDATABASE_USER=${bound:postgres-database:as}\nDATABASE_PASSWORD=${secret:postgres-database}\nSECRET_KEY=${secret:secret-key}\nBASEROW_PUBLIC_URL=http://localhost\n" }, { "id": "net", @@ -86,7 +83,7 @@ "volumes": [ "/services/baserow/data:/baserow/data" ], - "secrets-in-environment": "baserow reads DATABASE_PASSWORD, REDIS_PASSWORD and SECRET_KEY with os.getenv and has no _FILE twin (settings/base.py); not convertible" + "secrets-in-environment": "baserow reads DATABASE_PASSWORD and SECRET_KEY with os.getenv and has no _FILE twin (settings/base.py); not convertible" }, { "id": "runtime-config", diff --git a/modules/baserow/package.json b/modules/baserow/package.json index 5e788b5..8cf6c67 100644 --- a/modules/baserow/package.json +++ b/modules/baserow/package.json @@ -1,7 +1,7 @@ { "name": "@novox/module-baserow", "version": "0.1.0", - "description": "baserow — open-source no-code database. A consumer of a mesh Postgres database and Redis cache, with its own tools (novox/hq ADR 0039).", + "description": "baserow — open-source no-code database. A consumer of a mesh Postgres database, keeping its own cache, with its own tools (novox/hq ADR 0039).", "type": "module", "private": true, "dependencies": { diff --git a/modules/n8n/module.json b/modules/n8n/module.json index c4df38b..9d9f536 100644 --- a/modules/n8n/module.json +++ b/modules/n8n/module.json @@ -6,7 +6,6 @@ ], "requires": [ "postgres-database", - "redis-cache", "route" ], "contributes": { @@ -20,12 +19,10 @@ }, "binds": { "postgres-database": "/var/lib/n8n/database.json", - "redis-cache": "/var/lib/n8n/redis.json", "route": "/var/lib/n8n/route.json" }, "secrets": { - "postgres-database": "/var/lib/n8n/database.secret", - "redis-cache": "/var/lib/n8n/redis.secret" + "postgres-database": "/var/lib/n8n/database.secret" }, "own-secrets": { "basic-auth": "/var/lib/n8n/basic-auth.secret" @@ -57,7 +54,7 @@ "type": "file", "path": "/var/lib/n8n/server.env", "mode": "0600", - "content": "N8N_HOST=n8n.novox.be\nN8N_PORT=5678\nN8N_PROTOCOL=https\nWEBHOOK_URL=https://n8n.novox.be/\nN8N_BASIC_AUTH_ACTIVE=true\nN8N_BASIC_AUTH_USER=admin\nN8N_BASIC_AUTH_PASSWORD=${secret:basic-auth}\nNODE_FUNCTION_ALLOW_BUILTIN=*\nNODE_FUNCTION_ALLOW_EXTERNAL=*\nDB_TYPE=postgresdb\nDB_POSTGRESDB_HOST=${bound:postgres-database:at}\nDB_POSTGRESDB_PORT=${bound:postgres-database:port}\nDB_POSTGRESDB_DATABASE=${bound:postgres-database:as}\nDB_POSTGRESDB_USER=${bound:postgres-database:as}\nDB_POSTGRESDB_PASSWORD=${secret:postgres-database}\nQUEUE_BULL_REDIS_HOST=${bound:redis-cache:at}\nQUEUE_BULL_REDIS_PORT=${bound:redis-cache:port}\nQUEUE_BULL_REDIS_PASSWORD=${secret:redis-cache}\n" + "content": "N8N_HOST=n8n.novox.be\nN8N_PORT=5678\nN8N_PROTOCOL=https\nWEBHOOK_URL=https://n8n.novox.be/\nN8N_BASIC_AUTH_ACTIVE=true\nN8N_BASIC_AUTH_USER=admin\nN8N_BASIC_AUTH_PASSWORD=${secret:basic-auth}\nNODE_FUNCTION_ALLOW_BUILTIN=*\nNODE_FUNCTION_ALLOW_EXTERNAL=*\nDB_TYPE=postgresdb\nDB_POSTGRESDB_HOST=${bound:postgres-database:at}\nDB_POSTGRESDB_PORT=${bound:postgres-database:port}\nDB_POSTGRESDB_DATABASE=${bound:postgres-database:as}\nDB_POSTGRESDB_USER=${bound:postgres-database:as}\nDB_POSTGRESDB_PASSWORD=${secret:postgres-database}\n" }, { "id": "net",