diff options
Diffstat (limited to 'roles/apps/mumble/templates')
-rw-r--r-- | roles/apps/mumble/templates/acmetool-reload.sh.j2 | 2 | ||||
-rw-r--r-- | roles/apps/mumble/templates/config.ini.j2 | 10 | ||||
-rw-r--r-- | roles/apps/mumble/templates/pod-spec.yml.j2 | 30 |
3 files changed, 21 insertions, 21 deletions
diff --git a/roles/apps/mumble/templates/acmetool-reload.sh.j2 b/roles/apps/mumble/templates/acmetool-reload.sh.j2 index adef944d..fd9f01ba 100644 --- a/roles/apps/mumble/templates/acmetool-reload.sh.j2 +++ b/roles/apps/mumble/templates/acmetool-reload.sh.j2 @@ -4,7 +4,7 @@ EVENT_NAME="$1" [ "$EVENT_NAME" = "live-updated" ] || exit 42 MAIN_HOSTNAME="{{ mumble_hostnames[0] }}" -SSL_D="{{ mumble_base_path }}/{{ mumble_instance }}/config/ssl" +SSL_D="{{ mumble_base_path }}/{{ mumble_instance }}/ssl" while read name; do certdir="$ACME_STATE_DIR/live/$name" diff --git a/roles/apps/mumble/templates/config.ini.j2 b/roles/apps/mumble/templates/config.ini.j2 deleted file mode 100644 index c182492d..00000000 --- a/roles/apps/mumble/templates/config.ini.j2 +++ /dev/null @@ -1,10 +0,0 @@ -database=/srv/mumble/db/murmur.sqlite - -sslCert=/etc/mumble/ssl/cert.pem -sslKey=/etc/mumble/ssl/privkey.pem -sslDHParams=/etc/mumble/ssl/dhparams.pem -sslCiphers="ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES128:!RSA:!ADH:!AECDH:!MD5" - -{% for opt, value in mumble_config_options.items() %} -{{ opt }}={{ value }} -{% endfor %} 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 |