[fix] role:murmur

roles/murmur/defaults/main.json

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

roles/murmur/tasks/main.json

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

roles/murmur/templates/mumble-server.ini.j2

@@ -13,7 +13,7 @@
 
 ; Path to database. If blank, will search for
 ; murmur.sqlite in default locations or create it if not found.
-database={{var_murmur_database_path}}
+database={{cfg_murmur.database_path}}
 
 ; Murmur defaults to using SQLite with its default rollback journal.
 ; 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.
 ; If the welcome message is set to an empty string,
 ; no welcome message will be sent to clients.
-welcometext="{{var_murmur_welcome_text}}"
+welcometext="{{cfg_murmur.welcome_text}}"
 
 ; Port to bind TCP and UDP sockets to.
-port={{var_murmur_port | string}}
+port={{cfg_murmur.port | string}}
 
 ; Specific IP or hostname to bind to.
 ; 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.
 ; Otherwise, Murmur will create its own certificate automatically.
-{% if var_murmur_tls %}
+{% if cfg_murmur.tls %}
 sslKey=/var/murmurd/tls-key.pem
 sslCert=/var/murmurd/tls-fullchain.pem
 {% else %}