Improve volume handling, add migration confirmation step

6 files changed, 7 insertions, 25 deletions

diff --git a/roles/jails/02_postgres/defaults/main.yml b/roles/jails/02_postgres/defaults/main.yml
index d16d128..fa18195 100644
--- a/roles/jails/02_postgres/defaults/main.yml
+++ b/roles/jails/02_postgres/defaults/main.yml
@@ -4,6 +4,9 @@ devfs_ruleset: 5
 zfs:
   - name: zroot/jails/volumes/postgres_data
     mountpoint: /var/db/postgres
+    owner: "770"
+    group: "770"
+    mode: "0755"
 
 jail_conf_options:
   - "allow.raw_sockets"
diff --git a/roles/jails/02_postgres/tasks/main.yml b/roles/jails/02_postgres/tasks/main.yml
index 81d357a..8ce0864 100644
--- a/roles/jails/02_postgres/tasks/main.yml
+++ b/roles/jails/02_postgres/tasks/main.yml
@@ -7,15 +7,6 @@
     path: /var/db/postgres/data18/PG_VERSION
   register: _pg_data
 
-- name: Set postgres data directory ownership
-  file:
-    path: /var/db/postgres
-    state: directory
-    owner: postgres
-    group: postgres
-    mode: "0755"
-  when: not _pg_data.stat.exists
-
 - name: Initialize database
   shell: /usr/local/etc/rc.d/postgresql initdb
   when: not _pg_data.stat.exists
diff --git a/roles/jails/14_freshrss/defaults/main.yml b/roles/jails/14_freshrss/defaults/main.yml
index 5a55d8f..a8c3b54 100644
--- a/roles/jails/14_freshrss/defaults/main.yml
+++ b/roles/jails/14_freshrss/defaults/main.yml
@@ -3,6 +3,8 @@ userland: "15.0-RELEASE"
 zfs:
   - name: zroot/jails/volumes/freshrss_data
     mountpoint: /usr/local/FreshRSS/data
+    owner: "80"
+    group: "80"
 
 pkg:
   - nginx
diff --git a/roles/jails/14_freshrss/tasks/main.yml b/roles/jails/14_freshrss/tasks/main.yml
index 9cc08fc..50b8e7c 100644
--- a/roles/jails/14_freshrss/tasks/main.yml
+++ b/roles/jails/14_freshrss/tasks/main.yml
@@ -12,14 +12,6 @@
   register: _freshrss_download
   changed_when: "'constants.php' not in _freshrss_download.cmd"
 
-- name: Set FreshRSS data ownership
-  file:
-    path: /usr/local/FreshRSS/data
-    state: directory
-    owner: www
-    group: www
-    recurse: true
-
 - name: Create php-fpm socket directory
   file:
     path: /var/run/php
diff --git a/roles/jails/17_syncthing/defaults/main.yml b/roles/jails/17_syncthing/defaults/main.yml
index a6c0f29..27ec9ff 100644
--- a/roles/jails/17_syncthing/defaults/main.yml
+++ b/roles/jails/17_syncthing/defaults/main.yml
@@ -11,6 +11,8 @@ nullfs:
 zfs:
   - name: zroot/jails/volumes/syncthing_config
     mountpoint: /usr/local/etc/syncthing
+    owner: "1001"
+    group: "1001"
 
 pkg:
   - syncthing
diff --git a/roles/jails/17_syncthing/tasks/main.yml b/roles/jails/17_syncthing/tasks/main.yml
index 4575308..91eb61c 100644
--- a/roles/jails/17_syncthing/tasks/main.yml
+++ b/roles/jails/17_syncthing/tasks/main.yml
@@ -10,14 +10,6 @@
   shell: pw groupmod syncthing -g 1001 || true
   changed_when: false
 
-- name: Fix syncthing config ownership
-  file:
-    path: /usr/local/etc/syncthing
-    state: directory
-    owner: syncthing
-    group: syncthing
-    recurse: true
-
 - import_role:
     name: jail
     tasks_from: jail_launch