replace nginx with caddy2

This commit is contained in:
HgO
2021-03-28 10:48:06 +02:00
parent 7bb919e184
commit 66b27f9087
18 changed files with 254 additions and 142 deletions

View File

@@ -2,37 +2,32 @@ mumble_domain: "{{ inventory_hostname }}.local"
acme_enabled: no
acme_domains:
- name: "{{ mumble_domain }}"
hooks: |
{{ (
'systemctl reload nginx' if mumble_web_enabled else None,
'systemctl restart mumble-server' if murmur_enabled else None
) | reject("none") | list }}
- name: "{{ murmur_domains | first }}"
alt_domains: "{{ murmur_domains[1:] }}"
hooks:
- systemctl restart mumble-server
acme_directory_url: https://acme-v02.api.letsencrypt.org/directory
mumble_web_enabled: no
mumble_web_domain: "{{ mumble_domain }}"
mumble_web_domains:
- "{{ mumble_domain }}"
mumble_web_owner: mumble-web
mumble_web_group: "{{ mumble_web_owner }}"
mumble_web_certificate: "{{ acme_certs_dir }}/{{ mumble_web_domain }}.d/{{ acme_enabled | ternary('fullchain','cert') }}.pem"
mumble_web_trusted_certificate: "{{ acme_certs_dir }}/{{ mumble_web_domain }}.d/chain.pem"
mumble_web_private_key: "{{ acme_keys_dir }}/{{ mumble_web_domain }}.key"
mumble_web_www_dir: /var/www/mumble-web
mumble_web_dist_dir: "{{ mumble_web_www_dir }}/dist"
mumble_web_home_dir: /var/www/mumble-web
mumble_web_code_dir: "{{ mumble_web_home_dir }}/code"
mumble_web_dist_dir: "{{ mumble_web_code_dir }}/dist"
mumble_web_version: master
mumble_web_websockify_port: "64737"
mumble_web_nginx_enabled: yes
mumble_web_nginx_domains:
- "{{ mumble_web_domain }}"
mumble_web_nginx_config_dir: /etc/nginx
mumble_web_nginx_log_dir: /var/log/nginx
mumble_web_nginx_generate_dhparam: yes
mumble_web_nginx_dhparam: "{{ mumble_web_nginx_config_dir }}/ssl/dhparam.pem"
mumble_web_nginx_dhparam_size: 2048
mumble_web_caddy_enabled: yes
caddy_config_dir: /etc/caddy/conf.d
caddy_log_dir: /var/log/caddy
caddy_owner: caddy
caddy_group: caddy
murmur_enabled: no
murmur_domain: "{{ mumble_domain }}"
murmur_domains:
- "{{ mumble_domain }}"
murmur_superuser_password: supersecret
murmur_database:
path: "/var/lib/mumble-server/mumble-server.sqlite"
@@ -82,9 +77,9 @@ murmur_register:
hostname: "mymumblehostname.domain.org"
# Enable Bonjour for dev purpose
murmur_bonjour_enabled: no
murmur_certificate: "{{ acme_certs_dir }}/{{ murmur_domain }}.d/{{ acme_enabled | ternary('fullchain', 'cert') }}.pem"
murmur_trusted_certificate: "{{ acme_certs_dir }}/{{ murmur_domain }}.d/chain.pem"
murmur_private_key: "{{ acme_keys_dir }}/{{ murmur_domain }}.key"
murmur_certificate: "{{ acme_certs_dir }}/{{ murmur_domains | first }}.d/fullchain.pem"
murmur_trusted_certificate: "{{ acme_certs_dir }}/{{ murmur_domains | first }}.d/chain.pem"
murmur_private_key: "{{ acme_keys_dir }}/{{ murmur_domains | first }}.key"
murmur_dhparam: "@ffdhe4096"
murmur_owner: "mumble-server"
murmur_group: "{{ murmur_owner }}"