summaryrefslogtreecommitdiff
path: root/roles/apps
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-05-16 19:23:20 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-05-16 19:23:20 +0200
commita7e29b93eefbc82c7740d45da0cc1e61a286a241 (patch)
tree5f411d5374fb72c2e6c8b9bbbac6042b465694d2 /roles/apps
parentadd apt-repo/base and backports (diff)
kubernetes: set cgroup driver to systemd, enable metrics-server and node-local-dns
Diffstat (limited to 'roles/apps')
-rw-r--r--roles/apps/coturn/templates/acmetool-reload.sh.j22
-rwxr-xr-xroles/apps/nextcloud/templates/nextcloud-occ.j22
-rw-r--r--roles/apps/nextcloud/templates/run-cron.sh.j22
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/apps/coturn/templates/acmetool-reload.sh.j2 b/roles/apps/coturn/templates/acmetool-reload.sh.j2
index 1eff1ad3..c90c296d 100644
--- a/roles/apps/coturn/templates/acmetool-reload.sh.j2
+++ b/roles/apps/coturn/templates/acmetool-reload.sh.j2
@@ -18,7 +18,7 @@ while read name; do
install -m 0644 -o root -g coturn "$certdir/fullchain" "$SSL_D/cert.pem"
install -m 0640 -o root -g coturn "$certdir/privkey" "$SSL_D/privkey.pem"
-{% if kubernetes_cri_socket is defined %}
+{% if kubernetes_cri_socket %}
export CONTAINER_RUNTIME_ENDPOINT="{{ kubernetes_cri_socket }}"
{% endif %}
pod_id=$(crictl pods -q --state ready --name "^coturn-{{ coturn_realm }}-{{ ansible_nodename }}$")
diff --git a/roles/apps/nextcloud/templates/nextcloud-occ.j2 b/roles/apps/nextcloud/templates/nextcloud-occ.j2
index 571aecc4..7e2a51d4 100755
--- a/roles/apps/nextcloud/templates/nextcloud-occ.j2
+++ b/roles/apps/nextcloud/templates/nextcloud-occ.j2
@@ -9,7 +9,7 @@ if [ -z "$INST_NAME" ]; then
fi
set -eu
-{% if kubernetes_cri_socket is defined %}
+{% if kubernetes_cri_socket %}
export CONTAINER_RUNTIME_ENDPOINT="{{ kubernetes_cri_socket }}"
{% endif %}
diff --git a/roles/apps/nextcloud/templates/run-cron.sh.j2 b/roles/apps/nextcloud/templates/run-cron.sh.j2
index 9936bad1..755b7cb1 100644
--- a/roles/apps/nextcloud/templates/run-cron.sh.j2
+++ b/roles/apps/nextcloud/templates/run-cron.sh.j2
@@ -1,6 +1,6 @@
#!/bin/bash
-{% if kubernetes_cri_socket is defined %}
+{% if kubernetes_cri_socket %}
export CONTAINER_RUNTIME_ENDPOINT="{{ kubernetes_cri_socket }}"
{% endif %}