Merge branch 'main' of https://git.coopcloud.tech/coop-cloud/hedgedoc

Reviewed-on: coop-cloud/hedgedoc#16

.env.sample

@@ -8,6 +8,8 @@ DOMAIN=hedgedoc.example.com
 #EXTRA_DOMAINS=', `www.hedgedoc.example.com`'
 LETS_ENCRYPT_ENV=production
 
+SECRET_SESSION_SECRET_VERSION=v1
+
 COMPOSE_FILE="compose.yml"
 
 # PostgreSQL
@@ -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

abra.sh

@@ -1,2 +1,2 @@
-export ENTRYPOINT_CONF_VERSION=v10
+export ENTRYPOINT_CONF_VERSION=v11
 export PG_BACKUP_VERSION=v1

compose.yml

@@ -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
@@ -50,7 +54,7 @@ services:
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
-        - "coop-cloud.${STACK_NAME}.version=1.2.1+1.10.0"
+        - "coop-cloud.${STACK_NAME}.version=1.3.1+1.10.0"
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
     healthcheck:
       test: "nodejs -e \"http.get('http://localhost:3000', (res) => { console.log('status: ', res.statusCode); if (res.statusCode == 200) { process.exit(0); } else { process.exit(1); } });\""
@@ -61,6 +65,10 @@ services:
 volumes:
   codimd_uploads:
   codimd_database:
+secrets:
+  session_secret:
+    external: true
+    name: ${STACK_NAME}_session_secret_${SECRET_SESSION_SECRET_VERSION}
 networks:
   proxy:
     external: true

entrypoint.sh.tmpl

@@ -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() {

release/1.3.1+1.10.0

@@ -0,0 +1 @@
+holu