From cb1179f6862437c04853b7f922ef57f101d5c5c0 Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <hallo@pbrinkmeier.de>
Date: Mon, 15 Nov 2021 03:24:59 +0100
Subject: [PATCH] Add codi

---
 .gitignore                     |  1 +
 ansible/misc.yaml              | 20 +++++++++++++++++++-
 docker/web/Caddyfile           |  6 +++++-
 docker/web/docker-compose.yaml | 33 ++++++++++++++++++++++++++++++++-
 4 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..03bd412
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.env
diff --git a/ansible/misc.yaml b/ansible/misc.yaml
index adef274..265cd1b 100644
--- a/ansible/misc.yaml
+++ b/ansible/misc.yaml
@@ -1,6 +1,13 @@
 ---
 - hosts: misc
   tasks:
+    - name: Install basic packages
+      become: yes
+      apt:
+        name:
+          - vim
+          - git
+          - htop
     - include_role:
         name: docker
     - name: Install pip prerequisites
@@ -22,12 +29,23 @@
       copy:
         src: ../docker
         dest: /etc/pbri
+    - name: Create global docker volumes
+      become: yes
+      docker_volume:
+        name: "{{ item.name }}"
+        state: "{{ item.state }}"
+      loop:
+        - name: codi_database
+          state: present
+        - name: codi_uploads
+          state: present
     - name: Set up docker stuff
       become: yes
       docker_compose:
         project_src: "/etc/pbri/docker/{{ item.name }}"
         state: "{{ item.state }}"
+        build: yes
         debug: yes
       loop:
         - name: web
-          state: present
\ No newline at end of file
+          state: present
diff --git a/docker/web/Caddyfile b/docker/web/Caddyfile
index 21a8f86..b05f7ec 100644
--- a/docker/web/Caddyfile
+++ b/docker/web/Caddyfile
@@ -2,4 +2,8 @@ h2954114.stratoserver.net {
     file_server browse {
         root /usr/share
     }
-}
\ No newline at end of file
+}
+
+codi.pbrinkmeier.de {
+    reverse_proxy codi:3000
+}
diff --git a/docker/web/docker-compose.yaml b/docker/web/docker-compose.yaml
index 39a9d4c..21cd165 100644
--- a/docker/web/docker-compose.yaml
+++ b/docker/web/docker-compose.yaml
@@ -1,6 +1,7 @@
 version: "3"
 
 services:
+  # Webserver for static files and reverse proxy
   web:
     image: pbrinkmeier/web
     build: .
@@ -12,6 +13,36 @@ services:
       - caddy_config:/config
     restart: always
 
+  codi:
+    image: hackmdio/hackmd:2.4.1
+    # CMD_DB_{URL,CMD_SESSION_SECRET}
+    env_file: codi.env
+    environment:
+      - CMD_USECDN=false
+      - CMD_DOMAIN=codi.pbrinkmeier.de
+      - CMD_PROTOCOL_USESSL=true
+      - CMD_EMAIL=true
+      - CMD_ALLOW_EMAIL_REGISTER=false
+      - CMD_ALLOW_ANONYMOUS_EDITS=true
+    depends_on:
+      - codi_db
+    volumes:
+      - codi_uploads:/home/hackmd/app/public/uploads
+    restart: always
+    
+  codi_db:
+    image: postgres:11.6-alpine
+    # POSTGRES_{USER,PASSWORD,DB}
+    # Must match CMD_DB_URL in codi.env
+    env_file: codi_db.env
+    volumes:
+      - codi_database:/var/lib/postgresql/data
+    restart: always
+
 volumes:
   caddy_data:
-  caddy_config:
\ No newline at end of file
+  caddy_config:
+  codi_uploads:
+    external: yes
+  codi_database:
+    external: yes