apps/nextcloud: move common tassk to base role

9 files changed, 63 insertions, 60 deletions

diff --git a/roles/apps/nextcloud/base/defaults/main.yml b/roles/apps/nextcloud/base/defaults/main.yml
new file mode 100644
index 00000000..1a8a6d52
--- /dev/null
+++ b/roles/apps/nextcloud/base/defaults/main.yml
@@ -0,0 +1,9 @@
+---
+nextcloud_app_uid: "950"
+nextcloud_app_gid: "950"
+
+nextcloud_db_uid: "951"
+nextcloud_db_gid: "951"
+
+nextcloud_redis_uid: "952"
+nextcloud_redis_gid: "952"
diff --git a/roles/apps/nextcloud/base/tasks/main.yml b/roles/apps/nextcloud/base/tasks/main.yml
new file mode 100644
index 00000000..4c85a35c
--- /dev/null
+++ b/roles/apps/nextcloud/base/tasks/main.yml
@@ -0,0 +1,51 @@
+---
+- name: add group for nextcloud app
+  group:
+    name: nc-app
+    gid: "{{ nextcloud_app_gid }}"
+
+- name: add user for nextcloud app
+  user:
+    name: nc-app
+    uid: "{{ nextcloud_app_uid }}"
+    group: nc-app
+    password: "!"
+
+- name: add group for nextcloud db
+  group:
+    name: nc-db
+    gid: "{{ nextcloud_db_gid }}"
+
+- name: add user for nextcloud db
+  user:
+    name: nc-db
+    uid: "{{ nextcloud_db_uid }}"
+    group: nc-db
+    password: "!"
+
+- name: add group for nextcloud redis
+  group:
+    name: nc-redis
+    gid: "{{ nextcloud_redis_gid }}"
+
+- name: add user for nextcloud redis
+  user:
+    name: nc-redis
+    uid: "{{ nextcloud_redis_uid }}"
+    group: nc-redis
+    password: "!"
+
+- name: install template systemd unit for cron trigger
+  template:
+    src: cron@.service.j2
+    dest: /etc/systemd/system/nextcloud-cron@.service
+
+- name: install management scripts
+  loop:
+  - nextcloud-upgrade
+  - nextcloud-occ
+  - nextcloud-cron
+  template:
+    src: "{{ item }}.j2"
+    dest: "/usr/local/bin/{{ item }}"
+    mode: 0755
diff --git a/roles/apps/nextcloud/templates/cron@.service.j2 b/roles/apps/nextcloud/base/templates/cron@.service.j2
index d8cde0a3..d8cde0a3 100644
--- a/roles/apps/nextcloud/templates/cron@.service.j2
+++ b/roles/apps/nextcloud/base/templates/cron@.service.j2
diff --git a/roles/apps/nextcloud/templates/nextcloud-cron.j2 b/roles/apps/nextcloud/base/templates/nextcloud-cron.j2
index 355ae2c3..355ae2c3 100755
--- a/roles/apps/nextcloud/templates/nextcloud-cron.j2
+++ b/roles/apps/nextcloud/base/templates/nextcloud-cron.j2
diff --git a/roles/apps/nextcloud/templates/nextcloud-occ.j2 b/roles/apps/nextcloud/base/templates/nextcloud-occ.j2
index f12f1259..f12f1259 100755
--- a/roles/apps/nextcloud/templates/nextcloud-occ.j2
+++ b/roles/apps/nextcloud/base/templates/nextcloud-occ.j2
diff --git a/roles/apps/nextcloud/templates/nextcloud-upgrade.j2 b/roles/apps/nextcloud/base/templates/nextcloud-upgrade.j2
index ffa912e8..ffa912e8 100755
--- a/roles/apps/nextcloud/templates/nextcloud-upgrade.j2
+++ b/roles/apps/nextcloud/base/templates/nextcloud-upgrade.j2
diff --git a/roles/apps/nextcloud/defaults/main.yml b/roles/apps/nextcloud/defaults/main.yml
index 158da180..631b0a0a 100644
--- a/roles/apps/nextcloud/defaults/main.yml
+++ b/roles/apps/nextcloud/defaults/main.yml
@@ -1,13 +1,4 @@
 ---
-nextcloud_app_uid: "950"
-nextcloud_app_gid: "950"
-
-nextcloud_db_uid: "951"
-nextcloud_db_gid: "951"
-
-nextcloud_redis_uid: "952"
-nextcloud_redis_gid: "952"
-
 # nextcloud_instances:
 #   example:
 #     new: yes
diff --git a/roles/apps/nextcloud/meta/main.yml b/roles/apps/nextcloud/meta/main.yml
new file mode 100644
index 00000000..c00c47ce
--- /dev/null
+++ b/roles/apps/nextcloud/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - role: apps/nextcloud/base
diff --git a/roles/apps/nextcloud/tasks/main.yml b/roles/apps/nextcloud/tasks/main.yml
index 69bbba6a..6e81f351 100644
--- a/roles/apps/nextcloud/tasks/main.yml
+++ b/roles/apps/nextcloud/tasks/main.yml
@@ -1,55 +1,4 @@
 ---
-- name: add group for nextcloud app
-  group:
-    name: nc-app
-    gid: "{{ nextcloud_app_gid }}"
-
-- name: add user for nextcloud app
-  user:
-    name: nc-app
-    uid: "{{ nextcloud_app_uid }}"
-    group: nc-app
-    password: "!"
-
-- name: add group for nextcloud db
-  group:
-    name: nc-db
-    gid: "{{ nextcloud_db_gid }}"
-
-- name: add user for nextcloud db
-  user:
-    name: nc-db
-    uid: "{{ nextcloud_db_uid }}"
-    group: nc-db
-    password: "!"
-
-- name: add group for nextcloud redis
-  group:
-    name: nc-redis
-    gid: "{{ nextcloud_redis_gid }}"
-
-- name: add user for nextcloud redis
-  user:
-    name: nc-redis
-    uid: "{{ nextcloud_redis_uid }}"
-    group: nc-redis
-    password: "!"
-
-- name: install template systemd unit for cron trigger
-  template:
-    src: cron@.service.j2
-    dest: /etc/systemd/system/nextcloud-cron@.service
-
-- name: install management scripts
-  loop:
-  - nextcloud-upgrade
-  - nextcloud-occ
-  - nextcloud-cron
-  template:
-    src: "{{ item }}.j2"
-    dest: "/usr/local/bin/{{ item }}"
-    mode: 0755
-
 - name: instance specific tasks
   loop: "{{ nextcloud_instances | list }}"
   loop_control: