From aa18a043367b2df9caa5cf05bda6ac3283f3c473 Mon Sep 17 00:00:00 2001
From: Alex <caskd@420blaze.it>
Date: Sun, 12 Jul 2020 18:34:42 +0200
Subject: [PATCH] ZFS migration and repo updates

---
 backend.yml      | 12 +++++++-----
 roles/pleroma    |  2 +-
 roles/postgresql |  2 +-
 roles/redis      |  2 +-
 roles/systemd    |  2 +-
 roles/unbound    |  2 +-
 roles/varnish    |  2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/backend.yml b/backend.yml
index f42d7da..8536afe 100644
--- a/backend.yml
+++ b/backend.yml
@@ -10,10 +10,12 @@
         systemd:
                 services:
                         - { name: "postgresql@{{ postgres.version }}-main", enabled: true, action: reloaded }
-                        - { name: "redis", enabled: true, action: restarted }
+                        - { name: "redis-server", enabled: true, action: restarted }
                         - { name: "influxdb", enabled: true, action: restarted }
                 overrides:
                         - "influxdb"
+                        - "postgresql@"
+                        - "redis-server"
         postgres:
                 host: "{{ global.backend.postgres.host }}"
                 port: "{{ global.backend.postgres.port }}"
@@ -21,7 +23,8 @@
                 # NOTE: If something fails due to the following statement make sure
                 # the volume is mounted and the ansible cache is cleared!
                 data:
-                        uuid: '28464b32-32f4-42e4-9625-1dddfb65e1a9'
+                        path: "/dbs/postgres"
+                        #uuid: '28464b32-32f4-42e4-9625-1dddfb65e1a9'
                 databases:
                         - grafana
                         - pleroma
@@ -31,7 +34,8 @@
                 host: "{{ global.backend.redis.host }}"
                 port: "{{ global.backend.redis.port }}"
                 data:
-                        uuid: '1245e7d9-1054-4e2f-816a-d38efbb47589'
+                        #uuid: '1245e7d9-1054-4e2f-816a-d38efbb47589'
+                        path: "/dbs/redis"
         influxdb:
                 data:
                         path: "/var/lib/influxdb"
@@ -41,8 +45,6 @@
                 roles:
                         - "postgresql"
         mounts:
-                - { uuid: '{{ postgres.data.uuid }}', dest: '/var/lib/postgresql', state: 'mounted', fstype: 'ext4' }
-                - { uuid: '{{ redis.data.uuid }}', dest: '/var/lib/redis', state: 'mounted', fstype: 'ext4' }
                 - { uuid: '{{ influxdb.data.uuid }}', dest: '{{ influxdb.data.path }}', state: 'mounted', fstype: 'ext4' }
   roles:
         - vault
diff --git a/roles/pleroma b/roles/pleroma
index 6655bf6..c27fe21 160000
--- a/roles/pleroma
+++ b/roles/pleroma
@@ -1 +1 @@
-Subproject commit 6655bf6e2324f3b2caec37d973240f4e03a0b655
+Subproject commit c27fe21daba201c012fb6cb71684604bf5b8b676
diff --git a/roles/postgresql b/roles/postgresql
index afbfd5d..8b8a1a2 160000
--- a/roles/postgresql
+++ b/roles/postgresql
@@ -1 +1 @@
-Subproject commit afbfd5d645dbc6dee91f15bb73391398d713cb5b
+Subproject commit 8b8a1a2cb5d21dfb2056f8098ee53b37f6260f90
diff --git a/roles/redis b/roles/redis
index f912a05..7ebbd63 160000
--- a/roles/redis
+++ b/roles/redis
@@ -1 +1 @@
-Subproject commit f912a05ad0e338687ef2729c037a66e6df95dcdf
+Subproject commit 7ebbd63929ea04c6ea682db19f56679d78d5755b
diff --git a/roles/systemd b/roles/systemd
index f9bef95..12081a5 160000
--- a/roles/systemd
+++ b/roles/systemd
@@ -1 +1 @@
-Subproject commit f9bef9585657e6b4a55e628f524e3bad849f3196
+Subproject commit 12081a5fc072bc78dac01afc9741ec8f8289c564
diff --git a/roles/unbound b/roles/unbound
index 1af5356..8e2f773 160000
--- a/roles/unbound
+++ b/roles/unbound
@@ -1 +1 @@
-Subproject commit 1af5356b4d580997e1f007cb1a8f74f363bfa425
+Subproject commit 8e2f773811063d04174b65113a11a245b22bf043
diff --git a/roles/varnish b/roles/varnish
index fee4131..29c25ff 160000
--- a/roles/varnish
+++ b/roles/varnish
@@ -1 +1 @@
-Subproject commit fee4131da32ff24d62cadaa0a327009ce1d748e8
+Subproject commit 29c25ff02474d2eb9929f65b05acd71b81f0c108