simplify mumble domains

master
HgO 2020-12-26 01:33:14 +01:00
parent 55f1735deb
commit de1948ebc7
1 changed files with 12 additions and 12 deletions

View File

@ -1,15 +1,15 @@
mumble_domain: "{{ inventory_hostname }}.local"
acme_enabled: yes acme_enabled: yes
acme_account_email: acme@example.com acme_account_email: acme@example.com
acme_domains: acme_domains:
"{{ umurmur_domain }}": - name: "{{ numble_domain }}"
hooks: hooks: |
- systemctl restart umurmur {{ (
"{{ murmur_domain }}": 'systemctl reload nginx' if mumble_web_enabled else None,
hooks: 'systemctl restart umurmur' if umurmur_enabled else None,
- systemctl reload mumble-server 'systemctl restart mumble-server' if murmur_enabled else None
"{{ mumble_web_domain }}": ) | reject("none") | list }}
hooks:
- systemctl reload nginx
acme_config: acme_config:
account: account:
private_key: "{{ acme_accounts_dir }}/acme_account.key" private_key: "{{ acme_accounts_dir }}/acme_account.key"
@ -19,7 +19,7 @@ acme_config:
domains: "{{ acme_domains }}" domains: "{{ acme_domains }}"
mumble_web_enabled: yes mumble_web_enabled: yes
mumble_web_domain: "{{ inventory_hostname }}.local" mumble_web_domain: "{{ mumble_domain }}"
mumble_web_owner: mumble-web mumble_web_owner: mumble-web
mumble_web_group: "{{ mumble_web_owner }}" mumble_web_group: "{{ mumble_web_owner }}"
mumble_web_certificate: "{{ acme_certs_dir }}/{{ mumble_web_domain }}.d/{{ acme_enabled | ternary('fullchain','cert') }}.pem" mumble_web_certificate: "{{ acme_certs_dir }}/{{ mumble_web_domain }}.d/{{ acme_enabled | ternary('fullchain','cert') }}.pem"
@ -36,7 +36,7 @@ mumble_web_nginx_dhparam: "{{ mumble_web_nginx_config_dir }}/ssl/dhparam.pem"
mumble_web_nginx_dhparam_size: 2048 mumble_web_nginx_dhparam_size: 2048
murmur_enabled: yes murmur_enabled: yes
murmur_domain: "{{ mumble_web_domain }}" murmur_domain: "{{ mumble_domain }}"
murmur_superuser_password: supersecret murmur_superuser_password: supersecret
murmur_database: murmur_database:
path: "/var/lib/mumble-server/mumble-server.sqlite" path: "/var/lib/mumble-server/mumble-server.sqlite"
@ -98,7 +98,7 @@ murmur_ice_warn_unknown_properties: yes
murmur_ice_message_size_max: 65536 murmur_ice_message_size_max: 65536
umurmur_enabled: yes umurmur_enabled: yes
umurmur_domain: "{{ mumble_web_domain }}" umurmur_domain: "{{ mumble_domain }}"
umurmur_max_bandwidth: 48000 umurmur_max_bandwidth: 48000
umurmur_max_users: 100 umurmur_max_users: 100
umurmur_server_password: "" umurmur_server_password: ""