From 23f2f39c58ae2092ff192294b62a4c9119c45f89 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 11 Mar 2023 18:35:20 +0100
Subject: apps/mumble: switch to new official mumble container images

---
 roles/apps/mumble/templates/pod-spec.yml.j2 | 30 +++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'roles/apps/mumble/templates/pod-spec.yml.j2')

diff --git a/roles/apps/mumble/templates/pod-spec.yml.j2 b/roles/apps/mumble/templates/pod-spec.yml.j2
index 5308e72c..7a681b4a 100644
--- a/roles/apps/mumble/templates/pod-spec.yml.j2
+++ b/roles/apps/mumble/templates/pod-spec.yml.j2
@@ -5,27 +5,37 @@ securityContext:
 hostNetwork: true
 containers:
 - name: mumble
-  image: "phlak/mumble:{{ mumble_version }}"
+  image: "mumblevoip/mumble-server:{{ mumble_version }}"
   env:
   - name: TZ
     value: "{{ mumble_timezone }}"
-  - name: SUPERUSER_PASSWORD
+  - name: MUMBLE_SUPERUSER_PASSWORD
     value: "{{ mumble_superuser_password }}"
+  - name: MUMBLE_CONFIG_SSLCERT
+    value: "/etc/mumble/ssl/cert.pem"
+  - name: MUMBLE_CONFIG_SSLKEY
+    value: "/etc/mumble/ssl/privkey.pem"
+  - name: MUMBLE_CONFIG_SSLDHPARAMS
+    value: "/etc/mumble/ssl/dhparams.pem"
+{% for opt, value in mumble_config_options.items() %}
+  - name: MUMBLE_CONFIG_{{ opt | upper }}
+    value: "{{ value }}"
+{% endfor %}
   resources:
     limits:
       memory: "512Mi"
   volumeMounts:
-  - name: config
-    mountPath: /etc/mumble
+  - name: ssl
+    mountPath: /etc/mumble/ssl
     readOnly: true
-  - name: db
-    mountPath: /srv/mumble/db
+  - name: data
+    mountPath: /data
 volumes:
-- name: config
+- name: ssl
   hostPath:
-    path: "{{ mumble_base_path }}/{{ mumble_instance }}/config"
+    path: "{{ mumble_base_path }}/{{ mumble_instance }}/ssl"
     type: Directory
-- name: db
+- name: data
   hostPath:
-    path: "{{ mumble_base_path }}/{{ mumble_instance }}/db"
+    path: "{{ mumble_base_path }}/{{ mumble_instance }}/data"
     type: Directory
-- 
cgit v1.2.3