README.md

@@ -17,7 +17,7 @@
 
 ### Collaborative Markdown Editing
 
-[pad.pbrinkmeier.de](https://pad.pbrinkmeier.de)
+[codi.pbrinkmeier.de](https://codi.pbrinkmeier.de)
 
 ### Tichy-Clicker
 

ansible/playbooks/misc-docker.yaml

@@ -22,9 +22,6 @@
         - 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

docker/caddy/Caddyfile

@@ -11,10 +11,6 @@ tichy.click {
 }
 
 codi.pbrinkmeier.de {
-    redir https://pad.pbrinkmeier.de{uri} permanent
-}
-
-pad.pbrinkmeier.de {
     reverse_proxy codi:3000
 }
 

docker/codi/docker-compose.yaml

@@ -5,24 +5,15 @@ services:
     image: hackmdio/hackmd:2.4.2
     user: hackmd
     environment:
-      # 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_DOMAIN: codi.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"
-      # Misc
-      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_ALLOW_ANONYMOUS_EDITS: "true"
+      CMD_PLANTUML_SERVER: https://plantuml.pbrinkmeier.de
+      CMD_DB_URL: "postgres://${CODI_DB_USER}:${CODI_DB_PASSWORD}@codi_db/${CODI_DB_DB}"
+      CMD_SESSION_SECRET: "${CODI_SESSION_SECRET}"
       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

docker/gitea/Dockerfile

@@ -1,4 +1,4 @@
-FROM gitea/gitea:1.17.3
+FROM gitea/gitea:1.17.1
 
 RUN apk --no-cache add gcc python3-dev py3-pip linux-headers musl-dev libffi-dev
 RUN pip3 install --upgrade pip