From 404087a8b0dd88009e07fe5374f63ad3e72733b2 Mon Sep 17 00:00:00 2001 From: Paul Brinkmeier Date: Tue, 25 Oct 2022 15:24:12 +0200 Subject: [PATCH] Use hedgedoc instead of hackmd Use pad.pbrinkmeier.de instead of codi.pbrinkmeier.de --- README.md | 2 +- ansible/playbooks/misc-docker.yaml | 3 +++ docker/caddy/Caddyfile | 4 ++++ docker/codi/docker-compose.yaml | 26 +++++++++++++++++--------- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index ef6973d..16bd09e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ ### Collaborative Markdown Editing -[codi.pbrinkmeier.de](https://codi.pbrinkmeier.de) +[pad.pbrinkmeier.de](https://pad.pbrinkmeier.de) ### Tichy-Clicker diff --git a/ansible/playbooks/misc-docker.yaml b/ansible/playbooks/misc-docker.yaml index 5e0cc96..36b254d 100644 --- a/ansible/playbooks/misc-docker.yaml +++ b/ansible/playbooks/misc-docker.yaml @@ -22,6 +22,9 @@ - name: hackmd uid: 1500 state: present + - name: hedgedoc + uid: 10000 + state: present # All services that are behind Caddy need to be in this network - name: Create Caddy network become: true diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index f08ddf8..41eea1c 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -11,6 +11,10 @@ tichy.click { } codi.pbrinkmeier.de { + redir https://pad.pbrinkmeier.de{uri} permanent +} + +pad.pbrinkmeier.de { reverse_proxy codi:3000 } diff --git a/docker/codi/docker-compose.yaml b/docker/codi/docker-compose.yaml index 47bcb03..3aa8dcd 100644 --- a/docker/codi/docker-compose.yaml +++ b/docker/codi/docker-compose.yaml @@ -2,18 +2,26 @@ version: "3" services: codi: - image: hackmdio/hackmd:2.4.2 - user: hackmd + image: quay.io/hedgedoc/hedgedoc:1.9.4-alpine + user: hedgedoc environment: - CMD_USECDN: "false" - CMD_DOMAIN: codi.pbrinkmeier.de - CMD_PROTOCOL_USESSL: "true" - CMD_EMAIL: "false" - CMD_ALLOW_EMAIL_REGISTER: "false" - CMD_ALLOW_ANONYMOUS_EDITS: "true" - CMD_PLANTUML_SERVER: https://plantuml.pbrinkmeier.de + # Admin stuff CMD_DB_URL: "postgres://${CODI_DB_USER}:${CODI_DB_PASSWORD}@codi_db/${CODI_DB_DB}" CMD_SESSION_SECRET: "${CODI_SESSION_SECRET}" + CMD_USECDN: "false" + CMD_DOMAIN: pad.pbrinkmeier.de + CMD_PROTOCOL_USESSL: "true" + CMD_ALLOW_GRAVATAR: "false" + # Don't allow unauthenticated users to create notes + CMD_ALLOW_ANONYMOUS: "false" + # Allow unauthenticated users to edit "Freely" notes + CMD_ALLOW_ANONYMOUS_EDITS: "true" + CMD_ALLOW_FREEURL: "true" + CMD_REQUIRE_FREEURL_AUTHENTICATION: "true" + CMD_PLANTUML_SERVER: https://plantuml.pbrinkmeier.de + # Authentication: Use Gitea OAuth2 + CMD_EMAIL: "false" + CMD_ALLOW_EMAIL_REGISTER: "false" CMD_OAUTH2_CLIENT_ID: "${CODI_OAUTH2_CLIENT_ID}" CMD_OAUTH2_CLIENT_SECRET: "${CODI_OAUTH2_CLIENT_SECRET}" CMD_OAUTH2_AUTHORIZATION_URL: https://git.pbrinkmeier.de/login/oauth/authorize