Move Caddy into its own docker-compose config

ansible/README.md

@@ -22,6 +22,7 @@ Sets up:
 
 Deploys Docker configurations from `../docker`:
 
+- Sets up the docker network `caddy-network` for services that are reverse proxied by caddy
 - Copies configuration into `/etc/pbri/docker`
 - Creates folder `/var/lib/pbri/docker` for storing application files
 - Creates users with `42xxx` UIDs for running containers

ansible/misc-docker.yaml

@@ -1,6 +1,12 @@
 ---
 - hosts: misc
   tasks:
+    # All services that are behind Caddy need to be in this network
+    - name: Create Caddy network
+      become: yes
+      docker_network:
+        name: caddy-network
+        state: present
     - name: Upload docker configuration
       become: yes
       copy:
@@ -31,6 +37,8 @@
           state: absent
         - name: gitea
           state: present
+        - name: caddy
+          state: present
     - name: Add users for running containers
       become: yes
       ansible.builtin.user:

docker/caddy/Caddyfile

@@ -15,7 +15,7 @@ codi.pbrinkmeier.de {
 }
 
 git.pbrinkmeier.de {
-    reverse_proxy gitlab:80
+    reverse_proxy gitea:3000
 }
 
 ci.pbrinkmeier.de {

docker/caddy/docker-compose.yaml

@@ -0,0 +1,20 @@
+version: "3"
+
+services:
+  # Webserver for static files and reverse proxy
+  web:
+    image: pbrinkmeier/web
+    build: .
+    ports:
+      - 80:80
+      - 443:443
+    volumes:
+      - /var/lib/pbri/docker/caddy_data:/data
+      - /var/lib/pbri/docker/caddy_config:/config
+      - /home/paul/Sites:/srv:ro
+    restart: always
+
+networks:
+  default:
+    name: caddy-network
+    external: true

docker/gitea/docker-compose.yaml

@@ -10,10 +10,10 @@ services:
       USER_GID: 42001
       GITEA__server__DOMAIN: pbrinkmeier.de
       GITEA__server__HTTP_PORT: 3000
-      GITEA__server__ROOT_URL: http://pbrinkmeier.de:30000/
+      GITEA__server__ROOT_URL: https://git.pbrinkmeier.de/
       GITEA__server__SSH_DOMAIN: pbrinkmeier.de
-      GITEA__server__SSH_LISTEN_PORT: 3000
-      GITEA__server__SSH_PORT: 30001
+      GITEA__server__SSH_LISTEN_PORT: 22
+      GITEA__server__SSH_PORT: 22
       GITEA__server__OFFLINE_MODE: "true"
       GITEA__database__DB_TYPE: postgres
       GITEA__database__HOST: gitea_db:5432
@@ -41,8 +41,7 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - "30000:3000"
-      - "30001:22"
+      - 22:22
     depends_on:
       - gitea_db
 
@@ -55,3 +54,8 @@ services:
       POSTGRES_PASSWORD: "${GITEA_DB_PASSWORD}"
     volumes:
       - /var/lib/pbri/docker/gitea_db:/var/lib/postgresql/data
+
+networks:
+  default:
+    name: caddy-network
+    external: true

docker/web/README.md

@@ -1,6 +1,6 @@
 # web
 
-Contains stuff exposed via HTTP(S) to the Internet, e.g. personal website, Wiki, etc.
+Old god project.
 
 ## Jupyter
 

docker/web/docker-compose.yaml

@@ -1,19 +1,6 @@
 version: "3"
 
 services:
-  # Webserver for static files and reverse proxy
-  web:
-    image: pbrinkmeier/web
-    build: .
-    ports:
-      - 80:80
-      - 443:443
-    volumes:
-      - /var/lib/pbri/docker/caddy_data:/data
-      - /var/lib/pbri/docker/caddy_config:/config
-      - /home/paul/Sites:/srv:ro
-    restart: always
-
   codi:
     image: hackmdio/hackmd:2.4.2
     # CMD_DB_{URL,CMD_SESSION_SECRET}