feat: anubis

See #18

.env.sample

@@ -12,6 +12,9 @@ SECRET_SESSION_SECRET_VERSION=v1
 
 COMPOSE_FILE="compose.yml"
 
+# Anubis
+#COMPOSE_FILE="$COMPOSE_FILE:compose.anubis.yml"
+
 # PostgreSQL
 
 #COMPOSE_FILE="$COMPOSE_FILE:compose.postgresql.yml"
@@ -26,6 +29,7 @@ COMPOSE_FILE="compose.yml"
 #CMD_OAUTH2_TOKEN_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/token"
 #CMD_OAUTH2_USER_PROFILE_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/userinfo"
 #CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR=ocs.data.id
+#CMD_OAUTH2_USER_PROFILE_ID_ATTR=
 #CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR=ocs.data.display-name
 #CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR=ocs.data.email
 #CMD_OAUTH2_PROVIDERNAME=Keycloak
@@ -52,3 +56,4 @@ COMPOSE_FILE="compose.yml"
 # CMD_SESSION_LIFE=1209600000
 # Only present in config.json (no equivalent env var):
 # DOCUMENT_MAX_LENGTH=100000
+# CMD_ENABLE_UPLOADS=registered

abra.sh

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

compose.anubis.yml

@@ -0,0 +1,6 @@
+---
+version: "3.8"
+services:
+  app:
+    labels:
+    - "traefik.http.routers.${STACK_NAME}.middlewares=anubis@swarm,${STACK_NAME}-redirectscheme,${STACK_NAME}-redirecthostname"

compose.oauth.yml

@@ -13,6 +13,7 @@ services:
       - CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR
       - CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR
       - CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR
+      - CMD_OAUTH2_USER_PROFILE_ID_ATTR
       - CMD_OAUTH2_SCOPE
     secrets:
       - oauth_key

compose.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   app:
-    image: quay.io/hedgedoc/hedgedoc:1.10.3
+    image: quay.io/hedgedoc/hedgedoc:1.10.5
     environment:
       - CMD_USECDN=false
       - CMD_URL_ADDPORT=false
@@ -26,6 +26,7 @@ services:
       - CMD_SESSION_LIFE
       - CMD_SESSION_SECRET_FILE=/run/secrets/session_secret
       - DOCUMENT_MAX_LENGTH
+      - CMD_ENABLE_UPLOADS
     networks:
       - proxy
     volumes:
@@ -50,11 +51,14 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
-        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
-        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
-        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
+        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirectscheme,${STACK_NAME}-redirecthostname"
+        - "traefik.http.middlewares.${STACK_NAME}-redirectscheme.redirectscheme.scheme=https"
+        - "traefik.http.middlewares.${STACK_NAME}-redirectscheme.redirectscheme.permanent=true"
+        - "traefik.http.middlewares.${STACK_NAME}-redirecthostname.redirectregex.regex=^http[s]?://([^/]*)/(.*)"
+        - "traefik.http.middlewares.${STACK_NAME}-redirecthostname.redirectregex.replacement=https://${DOMAIN}/$${2}"
+        - "traefik.http.middlewares.${STACK_NAME}-redirecthostname.redirectregex.permanent=true"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
-        - "coop-cloud.${STACK_NAME}.version=3.0.2+1.10.3"
+        - "coop-cloud.${STACK_NAME}.version=3.0.5+1.10.5"
         - "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); } });\""
@@ -74,7 +78,7 @@ networks:
     external: true
 configs:
   config_json:
-    name: ${STACK_NAME}_config_${ENTRYPOINT_CONF_VERSION}
+    name: ${STACK_NAME}_config_json_${CONFIG_JSON_VERSION}
     file: config.json.tmpl
     template_driver: golang
   entrypoint_conf: