Compare commits

..

11 Commits

Author SHA1 Message Date
3wc
738fbe7a4e Re-add SECRET_SESSION_SECRET_VERSION..
..which I accidentally removed while rebasing
2024-10-27 12:36:57 -04:00
f
f05234338e fix: backup bot configuration 2024-10-27 12:36:15 -04:00
f
cb4219e7c3 fix: chown the database 2024-10-27 12:36:15 -04:00
f
b206e7a386 fix: db_password secret not needed 2024-10-27 12:36:13 -04:00
f
b4dd6ddbbd fix: don't overwrite CMD_DB_URL 2024-10-27 12:35:49 -04:00
f
a24809ab38 feat: postgresql support is optional 2024-10-27 12:35:49 -04:00
f
543f0823bb feat: support sqlite 2024-10-27 12:35:48 -04:00
6feab6a99e Merge pull request 'envvars' (#16) from fauno/hedgedoc:envvars into main
Reviewed-on: coop-cloud/hedgedoc#16
2024-10-27 06:22:01 +00:00
f
ca5a95bea6 fix: load secret from file into env var 2024-10-26 11:01:18 -03:00
f
6a036c4c82 fix: set session secret 2024-10-25 17:47:27 -03:00
f
d19f286c11 fix: require authentication for free urls 2024-10-25 17:46:47 -03:00
3 changed files with 13 additions and 0 deletions

View File

@ -10,6 +10,8 @@ LETS_ENCRYPT_ENV=production
COMPOSE_FILE="compose.yml"
SECRET_SESSION_SECRET_VERSION=v1
# PostgreSQL
#COMPOSE_FILE="$COMPOSE_FILE:compose.postgresql.yml"
@ -37,6 +39,7 @@ COMPOSE_FILE="compose.yml"
# CMD_ALLOW_ANONYMOUS_EDITS=false
# CMD_ALLOW_EMAIL_REGISTER=true
# CMD_ALLOW_FREEURL=false
# CMD_REQUIRE_FREEURL_AUTHENTICATION=true
# CMD_ALLOW_GRAVATAR=true
# CMD_ALLOW_ORIGIN=localhost
# CMD_COOKIE_POLICY=lax

View File

@ -13,6 +13,7 @@ services:
- CMD_ALLOW_ANONYMOUS_EDITS
- CMD_ALLOW_EMAIL_REGISTER
- CMD_ALLOW_FREEURL
- CMD_REQUIRE_FREEURL_AUTHENTICATION
- CMD_ALLOW_GRAVATAR
- CMD_ALLOW_ORIGIN
- CMD_COOKIE_POLICY
@ -23,12 +24,15 @@ services:
- CMD_DEFAULT_PERMISSION
- CMD_EMAIL
- CMD_SESSION_LIFE
- CMD_SESSION_SECRET_FILE=/run/secrets/session_secret
- DOCUMENT_MAX_LENGTH
networks:
- proxy
volumes:
- codimd_uploads:/hedgedoc/public/uploads
- codimd_database:/database
secrets:
- session_secret
entrypoint: /docker-entrypoint.sh
configs:
- source: entrypoint_conf
@ -61,6 +65,11 @@ services:
volumes:
codimd_uploads:
codimd_database:
secrets:
session_secret:
external: true
name: ${STACK_NAME}_session_secret_${SECRET_SESSION_SECRET_VERSION}
networks:
proxy:
external: true

View File

@ -24,6 +24,7 @@ file_env() {
load_vars() {
file_env "CMD_DB_PASSWORD"
file_env "CMD_OAUTH2_CLIENT_SECRET"
file_env "CMD_SESSION_SECRET"
}
main() {