diff options
author | Christian Pointner <equinox@spreadspace.org> | 2020-03-25 20:55:53 +0100 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2020-03-25 20:55:53 +0100 |
commit | e328d1bb0fe0f08b2f993a5a933307b77ad95c29 (patch) | |
tree | c612f8062fade03d2cc30649c62ea765df57541e | |
parent | sk-cloudia: new nextcloud instnace next.skillz.biz (diff) |
move some roles to app/
-rw-r--r-- | dan/sk-cloudia.yml | 6 | ||||
-rw-r--r-- | roles/apps/collabora/code/defaults/main.yml (renamed from roles/collabora/code/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/apps/collabora/code/tasks/main.yml (renamed from roles/collabora/code/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/apps/collabora/code/templates/nginx-vhost.conf.j2 (renamed from roles/collabora/code/templates/nginx-vhost.conf.j2) | 0 | ||||
-rw-r--r-- | roles/apps/collabora/code/templates/pod.yml.j2 (renamed from roles/collabora/code/templates/pod.yml.j2) | 0 | ||||
-rw-r--r-- | roles/apps/etherpad-lite/defaults/main.yml (renamed from roles/etherpad-lite/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/apps/etherpad-lite/tasks/main.yml (renamed from roles/etherpad-lite/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/apps/etherpad-lite/templates/nginx-vhost.conf.j2 (renamed from roles/etherpad-lite/templates/nginx-vhost.conf.j2) | 0 | ||||
-rw-r--r-- | roles/apps/etherpad-lite/templates/pod-with-mariadb.yml.j2 (renamed from roles/etherpad-lite/templates/pod-with-mariadb.yml.j2) | 0 | ||||
-rw-r--r-- | roles/apps/nextcloud/defaults/main.yml (renamed from roles/nextcloud/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/apps/nextcloud/tasks/main.yml (renamed from roles/nextcloud/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/apps/nextcloud/templates/apache-site.conf.j2 (renamed from roles/nextcloud/templates/apache-site.conf.j2) | 0 | ||||
-rw-r--r-- | roles/apps/nextcloud/templates/cron-.timer.j2 (renamed from roles/nextcloud/templates/cron-.timer.j2) | 0 | ||||
-rw-r--r-- | roles/apps/nextcloud/templates/cron@.service.j2 (renamed from roles/nextcloud/templates/cron@.service.j2) | 0 | ||||
-rwxr-xr-x | roles/apps/nextcloud/templates/nextcloud-occ.j2 (renamed from roles/nextcloud/templates/nextcloud-occ.j2) | 0 | ||||
-rwxr-xr-x | roles/apps/nextcloud/templates/nextcloud-upgrade.j2 (renamed from roles/nextcloud/templates/nextcloud-upgrade.j2) | 0 | ||||
-rw-r--r-- | roles/apps/nextcloud/templates/pod-with-mariadb.yml.j2 (renamed from roles/nextcloud/templates/pod-with-mariadb.yml.j2) | 0 | ||||
-rw-r--r-- | roles/apps/nextcloud/templates/run-cron.sh.j2 (renamed from roles/nextcloud/templates/run-cron.sh.j2) | 0 |
18 files changed, 3 insertions, 3 deletions
diff --git a/dan/sk-cloudia.yml b/dan/sk-cloudia.yml index b83db411..c24d4a1e 100644 --- a/dan/sk-cloudia.yml +++ b/dan/sk-cloudia.yml @@ -12,6 +12,6 @@ - role: kubernetes/standalone - role: acmetool/base - role: nginx/base - - role: nextcloud - - role: collabora/code - - role: etherpad-lite + - role: apps/nextcloud + - role: apps/collabora/code + - role: apps/etherpad-lite diff --git a/roles/collabora/code/defaults/main.yml b/roles/apps/collabora/code/defaults/main.yml index f17054ed..f17054ed 100644 --- a/roles/collabora/code/defaults/main.yml +++ b/roles/apps/collabora/code/defaults/main.yml diff --git a/roles/collabora/code/tasks/main.yml b/roles/apps/collabora/code/tasks/main.yml index ce88fe0d..ce88fe0d 100644 --- a/roles/collabora/code/tasks/main.yml +++ b/roles/apps/collabora/code/tasks/main.yml diff --git a/roles/collabora/code/templates/nginx-vhost.conf.j2 b/roles/apps/collabora/code/templates/nginx-vhost.conf.j2 index cec811f9..cec811f9 100644 --- a/roles/collabora/code/templates/nginx-vhost.conf.j2 +++ b/roles/apps/collabora/code/templates/nginx-vhost.conf.j2 diff --git a/roles/collabora/code/templates/pod.yml.j2 b/roles/apps/collabora/code/templates/pod.yml.j2 index ee4651a1..ee4651a1 100644 --- a/roles/collabora/code/templates/pod.yml.j2 +++ b/roles/apps/collabora/code/templates/pod.yml.j2 diff --git a/roles/etherpad-lite/defaults/main.yml b/roles/apps/etherpad-lite/defaults/main.yml index 5281c739..5281c739 100644 --- a/roles/etherpad-lite/defaults/main.yml +++ b/roles/apps/etherpad-lite/defaults/main.yml diff --git a/roles/etherpad-lite/tasks/main.yml b/roles/apps/etherpad-lite/tasks/main.yml index 6d4551db..6d4551db 100644 --- a/roles/etherpad-lite/tasks/main.yml +++ b/roles/apps/etherpad-lite/tasks/main.yml diff --git a/roles/etherpad-lite/templates/nginx-vhost.conf.j2 b/roles/apps/etherpad-lite/templates/nginx-vhost.conf.j2 index b59701fc..b59701fc 100644 --- a/roles/etherpad-lite/templates/nginx-vhost.conf.j2 +++ b/roles/apps/etherpad-lite/templates/nginx-vhost.conf.j2 diff --git a/roles/etherpad-lite/templates/pod-with-mariadb.yml.j2 b/roles/apps/etherpad-lite/templates/pod-with-mariadb.yml.j2 index a4acdd21..a4acdd21 100644 --- a/roles/etherpad-lite/templates/pod-with-mariadb.yml.j2 +++ b/roles/apps/etherpad-lite/templates/pod-with-mariadb.yml.j2 diff --git a/roles/nextcloud/defaults/main.yml b/roles/apps/nextcloud/defaults/main.yml index 16637f44..16637f44 100644 --- a/roles/nextcloud/defaults/main.yml +++ b/roles/apps/nextcloud/defaults/main.yml diff --git a/roles/nextcloud/tasks/main.yml b/roles/apps/nextcloud/tasks/main.yml index a951867c..a951867c 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/apps/nextcloud/tasks/main.yml diff --git a/roles/nextcloud/templates/apache-site.conf.j2 b/roles/apps/nextcloud/templates/apache-site.conf.j2 index a52a7fc5..a52a7fc5 100644 --- a/roles/nextcloud/templates/apache-site.conf.j2 +++ b/roles/apps/nextcloud/templates/apache-site.conf.j2 diff --git a/roles/nextcloud/templates/cron-.timer.j2 b/roles/apps/nextcloud/templates/cron-.timer.j2 index 0c3f7cd7..0c3f7cd7 100644 --- a/roles/nextcloud/templates/cron-.timer.j2 +++ b/roles/apps/nextcloud/templates/cron-.timer.j2 diff --git a/roles/nextcloud/templates/cron@.service.j2 b/roles/apps/nextcloud/templates/cron@.service.j2 index 822f64b4..822f64b4 100644 --- a/roles/nextcloud/templates/cron@.service.j2 +++ b/roles/apps/nextcloud/templates/cron@.service.j2 diff --git a/roles/nextcloud/templates/nextcloud-occ.j2 b/roles/apps/nextcloud/templates/nextcloud-occ.j2 index a79c5335..a79c5335 100755 --- a/roles/nextcloud/templates/nextcloud-occ.j2 +++ b/roles/apps/nextcloud/templates/nextcloud-occ.j2 diff --git a/roles/nextcloud/templates/nextcloud-upgrade.j2 b/roles/apps/nextcloud/templates/nextcloud-upgrade.j2 index aac5001f..aac5001f 100755 --- a/roles/nextcloud/templates/nextcloud-upgrade.j2 +++ b/roles/apps/nextcloud/templates/nextcloud-upgrade.j2 diff --git a/roles/nextcloud/templates/pod-with-mariadb.yml.j2 b/roles/apps/nextcloud/templates/pod-with-mariadb.yml.j2 index dfef3810..dfef3810 100644 --- a/roles/nextcloud/templates/pod-with-mariadb.yml.j2 +++ b/roles/apps/nextcloud/templates/pod-with-mariadb.yml.j2 diff --git a/roles/nextcloud/templates/run-cron.sh.j2 b/roles/apps/nextcloud/templates/run-cron.sh.j2 index 9936bad1..9936bad1 100644 --- a/roles/nextcloud/templates/run-cron.sh.j2 +++ b/roles/apps/nextcloud/templates/run-cron.sh.j2 |