summaryrefslogtreecommitdiff
path: root/roles/apps
diff options
context:
space:
mode:
Diffstat (limited to 'roles/apps')
-rw-r--r--roles/apps/coturn/templates/acmetool-reload.sh.j23
-rw-r--r--roles/apps/mumble/templates/acmetool-reload.sh.j23
-rwxr-xr-xroles/apps/nextcloud/templates/nextcloud-occ.j23
-rw-r--r--roles/apps/nextcloud/templates/run-cron.sh.j24
4 files changed, 0 insertions, 13 deletions
diff --git a/roles/apps/coturn/templates/acmetool-reload.sh.j2 b/roles/apps/coturn/templates/acmetool-reload.sh.j2
index c90c296d..08530583 100644
--- a/roles/apps/coturn/templates/acmetool-reload.sh.j2
+++ b/roles/apps/coturn/templates/acmetool-reload.sh.j2
@@ -18,9 +18,6 @@ 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 %}
- export CONTAINER_RUNTIME_ENDPOINT="{{ kubernetes_cri_socket }}"
-{% endif %}
pod_id=$(crictl pods -q --state ready --name "^coturn-{{ coturn_realm }}-{{ ansible_nodename }}$")
[ -n "$pod_id" ] || exit 42
container_id=$(crictl ps -q --name '^coturn$' -p "$pod_id")
diff --git a/roles/apps/mumble/templates/acmetool-reload.sh.j2 b/roles/apps/mumble/templates/acmetool-reload.sh.j2
index e3b8dbb7..adef944d 100644
--- a/roles/apps/mumble/templates/acmetool-reload.sh.j2
+++ b/roles/apps/mumble/templates/acmetool-reload.sh.j2
@@ -18,9 +18,6 @@ while read name; do
install -m 0644 -o root -g mumble "$certdir/fullchain" "$SSL_D/cert.pem"
install -m 0640 -o root -g mumble "$certdir/privkey" "$SSL_D/privkey.pem"
-{% if kubernetes_cri_socket %}
- export CONTAINER_RUNTIME_ENDPOINT="{{ kubernetes_cri_socket }}"
-{% endif %}
pod_id=$(crictl pods -q --state ready --name "^mumble-{{ mumble_instance }}-{{ ansible_nodename }}$")
[ -n "$pod_id" ] || exit 42
container_id=$(crictl ps -q --name '^mumble$' -p "$pod_id")
diff --git a/roles/apps/nextcloud/templates/nextcloud-occ.j2 b/roles/apps/nextcloud/templates/nextcloud-occ.j2
index 7e2a51d4..f12f1259 100755
--- a/roles/apps/nextcloud/templates/nextcloud-occ.j2
+++ b/roles/apps/nextcloud/templates/nextcloud-occ.j2
@@ -9,9 +9,6 @@ if [ -z "$INST_NAME" ]; then
fi
set -eu
-{% if kubernetes_cri_socket %}
-export CONTAINER_RUNTIME_ENDPOINT="{{ kubernetes_cri_socket }}"
-{% endif %}
pod_id=$(crictl pods -q --state ready --name "^nextcloud-$INST_NAME-{{ ansible_nodename }}$")
if [ -z "$pod_id" ]; then echo "Pod not found"; exit 1; fi
diff --git a/roles/apps/nextcloud/templates/run-cron.sh.j2 b/roles/apps/nextcloud/templates/run-cron.sh.j2
index 755b7cb1..455bc3ec 100644
--- a/roles/apps/nextcloud/templates/run-cron.sh.j2
+++ b/roles/apps/nextcloud/templates/run-cron.sh.j2
@@ -1,9 +1,5 @@
#!/bin/bash
-{% if kubernetes_cri_socket %}
-export CONTAINER_RUNTIME_ENDPOINT="{{ kubernetes_cri_socket }}"
-{% endif %}
-
POD_NAME="{{ item }}-$(hostname)"
POD_ID=$(crictl pods --name "$POD_NAME" --state ready -q)
CONTAINER_ID=$(crictl ps --pod "$POD_ID" --name nextcloud -q)