Compare commits

..

No commits in common. "dev-var_objects" and "main" have entirely different histories.

3 changed files with 16 additions and 18 deletions

View file

@ -1,10 +1,8 @@
{ {
"cfg_murmur": { "var_murmur_database_path": "/var/lib/mumble-server/mumble-server.sqlite",
"database_path": "/var/lib/mumble-server/mumble-server.sqlite", "var_murmur_domain": "murmur.example.org",
"domain": "murmur.example.org", "var_murmur_port": 64738,
"port": 64738, "var_murmur_welcome_text": "<br />Welcome to this server running <b>Murmur</b>.<br />Enjoy your stay!<br />",
"welcome_text": "<br />Welcome to this server running <b>Murmur</b>.<br />Enjoy your stay!<br />", "var_murmur_admin_password": "REPLACE_ME",
"admin_password": "REPLACE_ME", "var_murmur_tls": true
"tls": true
}
} }

View file

@ -11,7 +11,7 @@
}, },
{ {
"name": "tls | directory", "name": "tls | directory",
"when": "cfg_murmur.tls", "when": "var_murmur_tls",
"become": true, "become": true,
"ansible.builtin.file": { "ansible.builtin.file": {
"state": "directory", "state": "directory",
@ -20,11 +20,11 @@
}, },
{ {
"name": "tls | files", "name": "tls | files",
"when": "cfg_murmur.tls", "when": "var_murmur_tls",
"become": true, "become": true,
"loop": [ "loop": [
{"from": "/etc/ssl/private/{{cfg_murmur.domain}}.pem", "to": "/var/murmurd/tls-key.pem"}, {"from": "/etc/ssl/private/{{var_murmur_domain}}.pem", "to": "/var/murmurd/tls-key.pem"},
{"from": "/etc/ssl/fullchains/{{cfg_murmur.domain}}.pem", "to": "/var/murmurd/tls-fullchain.pem"} {"from": "/etc/ssl/fullchains/{{var_murmur_domain}}.pem", "to": "/var/murmurd/tls-fullchain.pem"}
], ],
"ansible.builtin.copy": { "ansible.builtin.copy": {
"remote_src": true, "remote_src": true,
@ -46,7 +46,7 @@
"name": "admin account", "name": "admin account",
"become": true, "become": true,
"ansible.builtin.command": { "ansible.builtin.command": {
"cmd": "murmurd -ini /etc/mumble-server.ini -supw {{cfg_murmur.admin_password}}" "cmd": "murmurd -ini /etc/mumble-server.ini -supw {{var_murmur_admin_password}}"
} }
}, },
{ {
@ -64,7 +64,7 @@
"become": true, "become": true,
"community.general.ufw": { "community.general.ufw": {
"rule": "allow", "rule": "allow",
"port": "{{cfg_murmur.port | string}}", "port": "{{var_murmur_port | string}}",
"proto": "tcp" "proto": "tcp"
} }
}, },

View file

@ -13,7 +13,7 @@
; Path to database. If blank, will search for ; Path to database. If blank, will search for
; murmur.sqlite in default locations or create it if not found. ; murmur.sqlite in default locations or create it if not found.
database={{cfg_murmur.database_path}} database={{var_murmur_database_path}}
; Murmur defaults to using SQLite with its default rollback journal. ; Murmur defaults to using SQLite with its default rollback journal.
; In some situations, using SQLite's write-ahead log (WAL) can be ; In some situations, using SQLite's write-ahead log (WAL) can be
@ -108,10 +108,10 @@ pidfile=/run/mumble-server/mumble-server.pid
; Welcome message sent to clients when they connect. ; Welcome message sent to clients when they connect.
; If the welcome message is set to an empty string, ; If the welcome message is set to an empty string,
; no welcome message will be sent to clients. ; no welcome message will be sent to clients.
welcometext="{{cfg_murmur.welcome_text}}" welcometext="{{var_murmur_welcome_text}}"
; Port to bind TCP and UDP sockets to. ; Port to bind TCP and UDP sockets to.
port={{cfg_murmur.port | string}} port={{var_murmur_port | string}}
; Specific IP or hostname to bind to. ; Specific IP or hostname to bind to.
; If this is left blank (default), Murmur will bind to all available addresses. ; If this is left blank (default), Murmur will bind to all available addresses.
@ -242,7 +242,7 @@ allowping=true
; If you have a proper SSL certificate, you can provide the filenames here. ; If you have a proper SSL certificate, you can provide the filenames here.
; Otherwise, Murmur will create its own certificate automatically. ; Otherwise, Murmur will create its own certificate automatically.
{% if cfg_murmur.tls %} {% if var_murmur_tls %}
sslKey=/var/murmurd/tls-key.pem sslKey=/var/murmurd/tls-key.pem
sslCert=/var/murmurd/tls-fullchain.pem sslCert=/var/murmurd/tls-fullchain.pem
{% else %} {% else %}