From f8cc6e5d99dc51594694a46a4b3167cc22a50f07 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Wed, 31 May 2023 10:11:36 +0200
Subject: [PATCH 1/6] add tag to overleaf docker image

---
 ansible/roles/overleaf/docker-stack.yml.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/overleaf/docker-stack.yml.j2 b/ansible/roles/overleaf/docker-stack.yml.j2
index 293cb04..020dc99 100644
--- a/ansible/roles/overleaf/docker-stack.yml.j2
+++ b/ansible/roles/overleaf/docker-stack.yml.j2
@@ -7,7 +7,7 @@ networks:
 
 services:
   sharelatex:
-    image: sharelatex/sharelatex
+    image: sharelatex/sharelatex:3
     networks:
       - traefik
       - overleaf
-- 
2.45.2


From 2e08a505bdf4396a795cd8c5474516ddab59d3f1 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Wed, 31 May 2023 21:03:43 +0200
Subject: [PATCH 2/6] add dns records to terraform

---
 terraform/dns.tf  | 73 +++++++++++++++++++++++++++++++++++++++++++++++
 terraform/main.tf |  5 ++++
 2 files changed, 78 insertions(+)
 create mode 100644 terraform/dns.tf

diff --git a/terraform/dns.tf b/terraform/dns.tf
new file mode 100644
index 0000000..7b722c6
--- /dev/null
+++ b/terraform/dns.tf
@@ -0,0 +1,73 @@
+data "external" "secrets" {
+  program = ["cat", pathexpand("~/.tfvars.json")]
+}
+
+provider "powerdns" {
+  server_url = "http://192.168.30.108:3000"
+  api_key    = data.external.secrets.result.powerdns_api_key
+}
+
+resource "powerdns_record" "subdomain_pim" {
+  for_each = toset(["dav", "git", "meet", "rss", "latex", "md", "swarm", "traefik", "syncthing", "cloud", "pihole", "ntfy", "apprise", "uptime", "concourse", "discourse"])
+  zone     = "pim.kunis.nl."
+  name     = "${each.key}.pim.kunis.nl."
+  type     = "CNAME"
+  records  = ["www.pim.kunis.nl."]
+  ttl      = 60
+}
+
+resource "powerdns_record" "social_pim_kunis_nl_a" {
+  zone     = "pim.kunis.nl."
+  name     = "social.pim.kunis.nl."
+  type     = "A"
+  records  = ["84.245.14.149"]
+  ttl      = 60
+}
+
+resource "powerdns_record" "kms_geokunis2_nl_a" {
+  zone     = "geokunis2.nl."
+  name     = "kms.geokunis2.nl."
+  type     = "A"
+  records  = ["84.245.14.149"]
+  ttl      = 60
+}
+
+resource "powerdns_record" "files_geokunis2_nl_a" {
+  zone     = "geokunis2.nl."
+  name     = "files.geokunis2.nl."
+  type     = "A"
+  records  = ["84.245.14.149"]
+  ttl      = 60
+}
+
+resource "powerdns_record" "files_geokunis2_nl_aaaa" {
+  zone     = "geokunis2.nl."
+  name     = "files.geokunis2.nl."
+  type     = "AAAA"
+  records  = ["2a02:58:19a:f730:b62e:99ff:fe77:1bda"]
+  ttl      = 60
+}
+
+resource "powerdns_record" "cyberchef_geokunis2_nl_a" {
+  zone     = "geokunis2.nl."
+  name     = "cyberchef.geokunis2.nl."
+  type     = "A"
+  records  = ["84.245.14.149"]
+  ttl      = 60
+}
+
+resource "powerdns_record" "cyberchef_geokunis2_nl_aaaa" {
+  zone     = "geokunis2.nl."
+  name     = "cyberchef.geokunis2.nl."
+  type     = "AAAA"
+  records  = ["2a02:58:19a:f730:c8fe:c0ff:feff:ee03"]
+  ttl      = 60
+}
+
+resource "powerdns_record" "inbucket_geokunis2_nl_a" {
+  zone     = "geokunis2.nl."
+  name     = "inbucket.geokunis2.nl."
+  type     = "A"
+  records  = ["84.245.14.149"]
+  ttl      = 60
+}
diff --git a/terraform/main.tf b/terraform/main.tf
index 73028ad..2312a39 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -8,6 +8,11 @@ terraform {
     libvirt = {
       source = "dmacvicar/libvirt"
     }
+
+    powerdns = {
+      source  = "pan-net/powerdns"
+      version = "1.5.0"
+    }
   }
 }
 
-- 
2.45.2


From 00a74415cf31ce15f58b3ac22d1dd3f1f5c6f6e8 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Sat, 10 Jun 2023 13:09:31 +0200
Subject: [PATCH 3/6] add nextcloud stack using NFS and remote postgres db

---
 ansible/inventory/group_vars/all.yml        | 14 ++++++++
 ansible/inventory/hosts.yml                 |  2 ++
 ansible/playbooks/setup.yml                 |  4 +--
 ansible/playbooks/stacks.yml                |  2 +-
 ansible/playbooks/thecloud.yml              | 24 +++++++++++++
 ansible/roles/database/handlers/main.yml    |  4 +++
 ansible/roles/database/tasks/main.yml       | 36 +++++++++++++++++++
 ansible/roles/nextcloud/docker-stack.yml.j2 | 40 +++++++++++++++++++++
 ansible/roles/nextcloud/tasks/main.yml      |  5 +++
 ansible/roles/traefik/docker-stack.yml.j2   |  6 ----
 ansible/roles/traefik/services.yml          |  4 ---
 11 files changed, 128 insertions(+), 13 deletions(-)
 create mode 100644 ansible/playbooks/thecloud.yml
 create mode 100644 ansible/roles/database/handlers/main.yml
 create mode 100644 ansible/roles/database/tasks/main.yml
 create mode 100644 ansible/roles/nextcloud/docker-stack.yml.j2
 create mode 100644 ansible/roles/nextcloud/tasks/main.yml

diff --git a/ansible/inventory/group_vars/all.yml b/ansible/inventory/group_vars/all.yml
index 7e0fdf0..7ea375a 100644
--- a/ansible/inventory/group_vars/all.yml
+++ b/ansible/inventory/group_vars/all.yml
@@ -1,2 +1,16 @@
 data_directory_base: /mnt/data
 git_ssh_port: 56287
+
+nfs_shares:
+  - name: nextcloud_data
+    path: "/mnt/data/nextcloud/data"
+
+database_passwords:
+  nextcloud: !vault |
+    $ANSIBLE_VAULT;1.1;AES256
+    66326230303135303930363761316534313439383365376231623661316635393839336431313262
+    3832626365376533646561653863316364313135343366330a356136343938666133356532613263
+    39663037623232363266376335643834353735363431636535386566643763386463353962663930
+    3466343563353162320a376437353933656166323364323166376663323531373338656563653463
+    33346263626430616164613937363836343430383233393061643231346661656539623938333631
+    3632373964346139316637663364646132636636373461613534
diff --git a/ansible/inventory/hosts.yml b/ansible/inventory/hosts.yml
index 983401e..aea4b94 100644
--- a/ansible/inventory/hosts.yml
+++ b/ansible/inventory/hosts.yml
@@ -2,6 +2,8 @@ all:
   hosts:
     manager:
       ansible_host: maestro.dmz
+    thecloud:
+      ansible_host: thecloud.dmz
   children:
     workers:
       hosts:
diff --git a/ansible/playbooks/setup.yml b/ansible/playbooks/setup.yml
index 258779a..7daa6ba 100644
--- a/ansible/playbooks/setup.yml
+++ b/ansible/playbooks/setup.yml
@@ -1,12 +1,12 @@
 ---
 - name: Wait for Cloud-init to finish
-  hosts: all
+  hosts: manager, workers
   gather_facts: no
   roles:
     - cloudinit_wait
 
 - name: Initialize Docker Swarm nodes
-  hosts: all
+  hosts: manager, workers
   pre_tasks:
     - name: Delete externally managed environment file
       shell:
diff --git a/ansible/playbooks/stacks.yml b/ansible/playbooks/stacks.yml
index dad95ac..242c3f7 100644
--- a/ansible/playbooks/stacks.yml
+++ b/ansible/playbooks/stacks.yml
@@ -17,4 +17,4 @@
     - {role: shephard, tags: shephard}
     - {role: jitsi, tags: jitsi}
     - {role: pihole, tags: pihole}
-    - {role: discourse, tags: discourse}
+    - {role: nextcloud, tags: nextcloud}
diff --git a/ansible/playbooks/thecloud.yml b/ansible/playbooks/thecloud.yml
new file mode 100644
index 0000000..ca639d1
--- /dev/null
+++ b/ansible/playbooks/thecloud.yml
@@ -0,0 +1,24 @@
+---
+- name: Create databases and NFS shares
+  hosts: thecloud
+  handlers:
+    - name: reload nfs
+      systemd:
+        name: nfs-kernel-server
+        state: restarted
+
+  tasks:
+    - name: Create nfs shares
+      with_items: "{{ nfs_shares }}"
+      copy:
+        dest: "/etc/exports.d/{{ item.name }}.exports"
+        content: "{{ item.path }} *(rw,sync,no_subtree_check,no_root_squash)"
+      notify: reload nfs
+
+    - name: Create databases
+      with_items: "{{ database_passwords | dict2items }}"
+      include_role:
+        name: database
+      vars:
+        database_name: "{{ item.key }}"
+        database_password: "{{ item.value }}"
diff --git a/ansible/roles/database/handlers/main.yml b/ansible/roles/database/handlers/main.yml
new file mode 100644
index 0000000..a09812e
--- /dev/null
+++ b/ansible/roles/database/handlers/main.yml
@@ -0,0 +1,4 @@
+- name: restart postgres
+  systemd:
+    name: postgresql
+    state: restarted
diff --git a/ansible/roles/database/tasks/main.yml b/ansible/roles/database/tasks/main.yml
new file mode 100644
index 0000000..e137486
--- /dev/null
+++ b/ansible/roles/database/tasks/main.yml
@@ -0,0 +1,36 @@
+- name: Create database user
+  postgresql_user:
+    name: swarm
+    password: "{{ database_password }}"
+  become: true
+  become_user: postgres
+
+- name: Create database
+  postgresql_db:
+    name: "{{ database_name }}"
+    owner: swarm
+  become: true
+  become_user: postgres
+
+- name: Grant access to database
+  postgresql_privs:
+    type: database
+    database: "{{ database_name }}"
+    role: swarm
+    grant_option: no
+    privs: all
+  become: true
+  become_user: postgres
+  notify: restart postgres
+
+- name: Allow remote access to database
+  postgresql_pg_hba:
+    dest: /etc/postgresql/15/main/pg_hba.conf
+    contype: host
+    databases: "{{ database_name }}"
+    users: swarm
+    address: all
+    create: true
+  become: true
+  become_user: postgres
+  notify: restart postgres
diff --git a/ansible/roles/nextcloud/docker-stack.yml.j2 b/ansible/roles/nextcloud/docker-stack.yml.j2
new file mode 100644
index 0000000..4d535f4
--- /dev/null
+++ b/ansible/roles/nextcloud/docker-stack.yml.j2
@@ -0,0 +1,40 @@
+# vi: ft=yaml
+version: '3.8'
+
+networks:
+  traefik:
+    external: true
+
+volumes:
+  data:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.30.10,nolock,soft,rw"
+      device: ":/mnt/data/nextcloud/data"
+
+services:
+  app:
+    image: nextcloud:26
+    volumes:
+      - type: volume
+        source: data
+        target: /var/www/html
+        volume:
+          nocopy: true
+    environment:
+      - POSTGRES_USER=swarm
+      - POSTGRES_DB=nextcloud
+      - POSTGRES_PASSWORD={{ database_passwords.nextcloud }}
+      - POSTGRES_HOST=192.168.30.10
+    networks:
+      - traefik
+    deploy:
+      labels:
+        - traefik.enable=true
+        - traefik.http.routers.nextcloud.entrypoints=websecure
+        - traefik.http.routers.nextcloud.rule=Host(`cloud.pim.kunis.nl`)
+        - traefik.http.routers.nextcloud.tls=true
+        - traefik.http.routers.nextcloud.tls.certresolver=letsencrypt
+        - traefik.http.routers.nextcloud.service=nextcloud
+        - traefik.http.services.nextcloud.loadbalancer.server.port=80
+        - traefik.docker.network=traefik
diff --git a/ansible/roles/nextcloud/tasks/main.yml b/ansible/roles/nextcloud/tasks/main.yml
new file mode 100644
index 0000000..9b3430e
--- /dev/null
+++ b/ansible/roles/nextcloud/tasks/main.yml
@@ -0,0 +1,5 @@
+- name: Deploy Docker stack
+  docker_stack:
+    name: nextcloud
+    compose:
+      - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}"
diff --git a/ansible/roles/traefik/docker-stack.yml.j2 b/ansible/roles/traefik/docker-stack.yml.j2
index ed0bec3..a540c80 100644
--- a/ansible/roles/traefik/docker-stack.yml.j2
+++ b/ansible/roles/traefik/docker-stack.yml.j2
@@ -39,12 +39,6 @@ services:
         - traefik.http.routers.esrom.tls=true
         - traefik.http.routers.esrom.tls.certresolver=letsencrypt
 
-        - traefik.http.routers.nextcloud.entrypoints=websecure
-        - traefik.http.routers.nextcloud.service=nextcloud@file
-        - traefik.http.routers.nextcloud.rule=Host(`cloud.pim.kunis.nl`)
-        - traefik.http.routers.nextcloud.tls=true
-        - traefik.http.routers.nextcloud.tls.certresolver=letsencrypt
-
         - traefik.http.routers.uptime.entrypoints=localsecure
         - traefik.http.routers.uptime.rule=Host(`uptime.pim.kunis.nl`)
         - traefik.http.routers.uptime.service=uptime@file
diff --git a/ansible/roles/traefik/services.yml b/ansible/roles/traefik/services.yml
index 9e5906f..206bec4 100644
--- a/ansible/roles/traefik/services.yml
+++ b/ansible/roles/traefik/services.yml
@@ -4,10 +4,6 @@ http:
       loadBalancer:
         servers:
           - url: http://esrom.dmz:80/
-    nextcloud:
-      loadBalancer:
-        servers:
-          - url: http://nextcloud.dmz:80/
     uptime:
       loadBalancer:
         servers:
-- 
2.45.2


From 32c090eed77b118a796df887f97a6b17ba725182 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Wed, 14 Jun 2023 11:27:44 +0200
Subject: [PATCH 4/6] migrate freshrss and radicale to nfs

---
 ansible/inventory/group_vars/all.yml        |  8 +++++-
 ansible/roles/freshrss/docker-stack.yml.j2  | 29 +++++++++++++++------
 ansible/roles/nextcloud/docker-stack.yml.j2 |  2 +-
 ansible/roles/radicale/docker-stack.yml.j2  | 18 ++++++++-----
 4 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/ansible/inventory/group_vars/all.yml b/ansible/inventory/group_vars/all.yml
index 7ea375a..8bdef52 100644
--- a/ansible/inventory/group_vars/all.yml
+++ b/ansible/inventory/group_vars/all.yml
@@ -3,7 +3,13 @@ git_ssh_port: 56287
 
 nfs_shares:
   - name: nextcloud_data
-    path: "/mnt/data/nextcloud/data"
+    path: /mnt/data/nextcloud/data
+  - name: radicale
+    path: /mnt/data/radicale
+  - name: freshrss_data
+    path: /mnt/data/freshrss/data
+  - name: freshrss_extensions
+    path: /mnt/data/freshrss/extensions
 
 database_passwords:
   nextcloud: !vault |
diff --git a/ansible/roles/freshrss/docker-stack.yml.j2 b/ansible/roles/freshrss/docker-stack.yml.j2
index 43cbd85..2a23a77 100644
--- a/ansible/roles/freshrss/docker-stack.yml.j2
+++ b/ansible/roles/freshrss/docker-stack.yml.j2
@@ -5,18 +5,34 @@ networks:
   traefik:
     external: true
 
+volumes:
+  data:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.30.10,nolock,soft,rw"
+      device: ":/mnt/data/freshrss/data"
+  extensions:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.30.10,nolock,soft,rw"
+      device: ":/mnt/data/freshrss/extensions"
+
 services:
   freshrss:
     image: freshrss/freshrss:edge
     networks:
       - traefik
     volumes:
-      - type: bind
-        source: /mnt/data/freshrss/data
+      - type: volume
+        source: data
         target: /var/www/FreshRSS/data
-      - type: bind
-        source: /mnt/data/freshrss/extensions
+        volume:
+          nocopy: true
+      - type: volume
+        source: extensions
         target: /var/www/FreshRSS/extensions
+        volume:
+          nocopy: true
     environment:
       TZ: Europe/Amsterdam
       CRON_MIN: '2,32'
@@ -25,13 +41,10 @@ services:
       ADMIN_API_PASSWORD: {{ admin_password }}
       PUBLISHED_PORT: 443
     deploy:
-      placement:
-        constraints:
-          - "node.labels.freshrss == true"
       labels:
         - traefik.enable=true
         - traefik.http.routers.freshrss.entrypoints=websecure
-        - traefik.http.routers.freshrss.rule=Host(`rss.pim.kunis.nl`)
+        - traefik.http.routers.freshrss.rule=Host(`rss.kun.is`)
         - traefik.http.routers.freshrss.tls=true
         - traefik.http.routers.freshrss.tls.certresolver=letsencrypt
         - traefik.http.routers.freshrss.service=freshrss
diff --git a/ansible/roles/nextcloud/docker-stack.yml.j2 b/ansible/roles/nextcloud/docker-stack.yml.j2
index 4d535f4..395556c 100644
--- a/ansible/roles/nextcloud/docker-stack.yml.j2
+++ b/ansible/roles/nextcloud/docker-stack.yml.j2
@@ -32,7 +32,7 @@ services:
       labels:
         - traefik.enable=true
         - traefik.http.routers.nextcloud.entrypoints=websecure
-        - traefik.http.routers.nextcloud.rule=Host(`cloud.pim.kunis.nl`)
+        - traefik.http.routers.nextcloud.rule=Host(`cloud.kun.is`)
         - traefik.http.routers.nextcloud.tls=true
         - traefik.http.routers.nextcloud.tls.certresolver=letsencrypt
         - traefik.http.routers.nextcloud.service=nextcloud
diff --git a/ansible/roles/radicale/docker-stack.yml.j2 b/ansible/roles/radicale/docker-stack.yml.j2
index 794e52d..61fba13 100644
--- a/ansible/roles/radicale/docker-stack.yml.j2
+++ b/ansible/roles/radicale/docker-stack.yml.j2
@@ -13,6 +13,13 @@ configs:
     external: true
     name: "{{ users.config_name }}"
 
+volumes:
+  data:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.30.10,nolock,soft,rw"
+      device: ":/mnt/data/radicale"
+
 services:
   radicale:
     image: tomsquest/docker-radicale
@@ -30,19 +37,18 @@ services:
       interval: 30s
       retries: 3
     volumes:
-      - type: bind
-        source: /mnt/data/radicale
+      - type: volume
+        source: data
         target: /data
+        volume:
+          nocopy: true
     networks:
       - traefik
     deploy:
-      placement:
-        constraints:
-          - "node.labels.radicale == true"
       labels:
         - traefik.enable=true
         - traefik.http.routers.radicale.entrypoints=websecure
-        - traefik.http.routers.radicale.rule=Host(`dav.pim.kunis.nl`)
+        - traefik.http.routers.radicale.rule=Host(`dav.kun.is`)
         - traefik.http.routers.radicale.tls=true
         - traefik.http.routers.radicale.tls.certresolver=letsencrypt
         - traefik.http.routers.radicale.service=radicale
-- 
2.45.2


From 932b93056721bcdbb4007198a6d84474052c9982 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Thu, 15 Jun 2023 08:26:34 +0200
Subject: [PATCH 5/6] move pihole to nfs

---
 ansible/inventory/group_vars/all.yml     |  4 ++++
 ansible/roles/pihole/docker-stack.yml.j2 | 29 +++++++++++++++++-------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/ansible/inventory/group_vars/all.yml b/ansible/inventory/group_vars/all.yml
index 8bdef52..7e98154 100644
--- a/ansible/inventory/group_vars/all.yml
+++ b/ansible/inventory/group_vars/all.yml
@@ -10,6 +10,10 @@ nfs_shares:
     path: /mnt/data/freshrss/data
   - name: freshrss_extensions
     path: /mnt/data/freshrss/extensions
+  - name: pihole_data
+    path: /mnt/data/pihole/data
+  - name: pihole_dnsmasq
+    path: /mnt/data/pihole/dnsmasq
 
 database_passwords:
   nextcloud: !vault |
diff --git a/ansible/roles/pihole/docker-stack.yml.j2 b/ansible/roles/pihole/docker-stack.yml.j2
index 637eb78..b9f82fc 100644
--- a/ansible/roles/pihole/docker-stack.yml.j2
+++ b/ansible/roles/pihole/docker-stack.yml.j2
@@ -1,11 +1,23 @@
 # vi: ft=yaml
-version: "3"
+version: "3.8"
 
 networks:
   traefik:
     external: true
   pihole:
 
+volumes:
+  data:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.30.10,nolock,soft,rw"
+      device: ":/mnt/data/pihole/data"
+  dnsmasq:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.30.10,nolock,soft,rw"
+      device: ":/mnt/data/pihole/dnsmasq"
+
 services:
   pihole:
     image: pihole/pihole:latest
@@ -18,18 +30,19 @@ services:
       WEBPASSWORD: {{ pihole_password }}
       PIHOLE_DNS_: '192.168.30.1'
     volumes:
-      - type: bind
-        source: /mnt/data/pihole/data
+      - type: volume
+        source: data
         target: /etc/pihole
-      - type: bind
-        source: /mnt/data/pihole/dnsmasq
+        volume:
+          nocopy: true
+      - type: volume
+        source: dnsmasq
         target: /etc/dnsmasq.d
+        volume:
+          nocopy: true
     networks:
       - traefik
     deploy:
-      placement:
-        constraints:
-          - "node.labels.pihole == true"
       labels:
         - traefik.enable=true
         - traefik.http.routers.pihole.entrypoints=localsecure
-- 
2.45.2


From aba119e127a421a6e706af6b99d6f74bc94640bc Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Thu, 15 Jun 2023 13:15:10 +0200
Subject: [PATCH 6/6] move hedgedoc to nfs fix database user passwords

---
 ansible/inventory/group_vars/all.yml       | 10 ++++++
 ansible/roles/database/tasks/main.yml      |  8 ++---
 ansible/roles/hedgedoc/docker-stack.yml.j2 | 41 +++++++---------------
 ansible/roles/hedgedoc/tasks/main.yml      |  3 ++
 4 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/ansible/inventory/group_vars/all.yml b/ansible/inventory/group_vars/all.yml
index 7e98154..2513cac 100644
--- a/ansible/inventory/group_vars/all.yml
+++ b/ansible/inventory/group_vars/all.yml
@@ -14,6 +14,8 @@ nfs_shares:
     path: /mnt/data/pihole/data
   - name: pihole_dnsmasq
     path: /mnt/data/pihole/dnsmasq
+  - name: hedgedoc_uploads
+    path: /mnt/data/hedgedoc/uploads
 
 database_passwords:
   nextcloud: !vault |
@@ -24,3 +26,11 @@ database_passwords:
     3466343563353162320a376437353933656166323364323166376663323531373338656563653463
     33346263626430616164613937363836343430383233393061643231346661656539623938333631
     3632373964346139316637663364646132636636373461613534
+  hedgedoc: !vault |
+    $ANSIBLE_VAULT;1.1;AES256
+    63363464666633663762393135333362613966636338623533393132376338343339653431396465
+    6634643863623163366235393434343662313735363438610a373065363361326565633766633835
+    38383637343230363031636634623930666365333739323162313937656239646166613738393965
+    3533666462303563360a313233306335396234393932396331313238376464363964363839396164
+    66366662356135343035363935616664613831626131376330643133313530636431613266636165
+    6265613666616164373637356235396165383662333561393939
diff --git a/ansible/roles/database/tasks/main.yml b/ansible/roles/database/tasks/main.yml
index e137486..0daddd5 100644
--- a/ansible/roles/database/tasks/main.yml
+++ b/ansible/roles/database/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: Create database user
   postgresql_user:
-    name: swarm
+    name: "{{ database_name }}"
     password: "{{ database_password }}"
   become: true
   become_user: postgres
@@ -8,7 +8,7 @@
 - name: Create database
   postgresql_db:
     name: "{{ database_name }}"
-    owner: swarm
+    owner: "{{ database_name }}"
   become: true
   become_user: postgres
 
@@ -16,7 +16,7 @@
   postgresql_privs:
     type: database
     database: "{{ database_name }}"
-    role: swarm
+    role: "{{ database_name }}"
     grant_option: no
     privs: all
   become: true
@@ -28,7 +28,7 @@
     dest: /etc/postgresql/15/main/pg_hba.conf
     contype: host
     databases: "{{ database_name }}"
-    users: swarm
+    users: "{{ database_name }}"
     address: all
     create: true
   become: true
diff --git a/ansible/roles/hedgedoc/docker-stack.yml.j2 b/ansible/roles/hedgedoc/docker-stack.yml.j2
index c5be6d3..6a03c41 100644
--- a/ansible/roles/hedgedoc/docker-stack.yml.j2
+++ b/ansible/roles/hedgedoc/docker-stack.yml.j2
@@ -4,32 +4,19 @@ version: '3'
 networks:
   traefik:
     external: true
-  hedgedoc:
+
+volumes:
+  uploads:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.30.10,nolock,soft,rw"
+      device: ":/mnt/data/hedgedoc/uploads"
 
 services:
-  hedgedoc-db:
-    image: postgres:13.4-alpine
-    environment:
-      - POSTGRES_USER=hedgedoc
-      - POSTGRES_PASSWORD=password
-      - POSTGRES_DB=hedgedoc
-    volumes:
-      - type: bind
-        source: /mnt/data/hedgedoc/database
-        target: /var/lib/postgresql/data
-    networks:
-      hedgedoc:
-        aliases:
-          - database
-    deploy:
-      placement:
-        constraints:
-          - "node.labels.hedgedoc == true"
-
   hedgedoc-app:
     image: quay.io/hedgedoc/hedgedoc:1.9.7
     environment:
-      - CMD_DB_URL=postgres://hedgedoc:password@database:5432/hedgedoc
+      - CMD_DB_URL=postgres://hedgedoc:{{ database_passwords.hedgedoc }}@192.168.30.10:5432/hedgedoc
       - CMD_DOMAIN=md.pim.kunis.nl
       - CMD_PORT=3000
       - CMD_URL_ADDPORT=false
@@ -38,18 +25,14 @@ services:
       - CMD_PROTOCOL_USESSL=true
       - CMD_SESSION_SECRET={{ session_secret }}
     volumes:
-      - type: bind
-        source: /mnt/data/hedgedoc/uploads
+      - type: volume
+        source: uploads
         target: /hedgedoc/public/uploads
-    depends_on:
-      - hedgedoc-db
+        volume:
+          nocopy: true
     networks:
       - traefik
-      - hedgedoc
     deploy:
-      placement:
-        constraints:
-          - "node.labels.hedgedoc == true"
       labels:
         - traefik.enable=true
         - traefik.http.routers.hedgedoc.entrypoints=websecure
diff --git a/ansible/roles/hedgedoc/tasks/main.yml b/ansible/roles/hedgedoc/tasks/main.yml
index e3ca514..10c8f08 100644
--- a/ansible/roles/hedgedoc/tasks/main.yml
+++ b/ansible/roles/hedgedoc/tasks/main.yml
@@ -1,3 +1,6 @@
+- name: asdfasdf
+  debug:
+    msg: "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}"
 - name: Deploy Docker stack
   docker_stack:
     name: hedgedoc
-- 
2.45.2