diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2019-10-14 23:39:30 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2019-10-14 23:39:30 +0200 |
| commit | c294ec512895c327784536588cba8d3f7b4aad43 (patch) | |
| tree | 267e4e4f1f50ed7cd761e215b2b9303def7ef9bc | |
| parent | collabora doesn't need a special user (diff) | |
nextcloud prefix for pod and nginx config
| -rw-r--r-- | inventory/host_vars/sk-cloudia/nextcloud.yml | 2 | ||||
| -rw-r--r-- | roles/nextcloud/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/nextcloud/templates/pod-with-mariadb.yml.j2 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/inventory/host_vars/sk-cloudia/nextcloud.yml b/inventory/host_vars/sk-cloudia/nextcloud.yml index 6077579b..5ded829d 100644 --- a/inventory/host_vars/sk-cloudia/nextcloud.yml +++ b/inventory/host_vars/sk-cloudia/nextcloud.yml @@ -17,7 +17,7 @@ nextcloud_instances: version: 10.4.8 password: "{{ vault_nextcloud_database_passwords['wolke.elevate.at'] }}" insomnia.skillz.biz: - new: yes + new: false version: 16.0.5 port: 8101 hostnames: diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 1b0602f5..cf710f7a 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -103,7 +103,7 @@ label: "{{ item.key }}" template: src: "pod-with-{{ item.value.database.type }}.yml.j2" - dest: "/etc/kubernetes/manifests/{{ item.key }}.yml" + dest: "/etc/kubernetes/manifests/nextcloud-{{ item.key }}.yml" mode: 0600 @@ -140,7 +140,7 @@ name: nginx/vhost vars: nginx_vhost: - name: "{{ item.key }}" + name: "nextcloud-{{ item.key }}" template: generic-proxy-no-buffering-with-acme acme: true hostnames: "{{ item.value.hostnames }}" diff --git a/roles/nextcloud/templates/pod-with-mariadb.yml.j2 b/roles/nextcloud/templates/pod-with-mariadb.yml.j2 index cebcb2ef..dfef3810 100644 --- a/roles/nextcloud/templates/pod-with-mariadb.yml.j2 +++ b/roles/nextcloud/templates/pod-with-mariadb.yml.j2 @@ -1,7 +1,7 @@ apiVersion: v1 kind: Pod metadata: - name: "{{ item.key }}" + name: "nextcloud-{{ item.key }}" spec: securityContext: allowPrivilegeEscalation: false |