From d5f8926cb403757c08a145f054a7c11ba5f9f4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Fra=C3=9F?=
 <christian.frass@dielinke-glauchau.de>
Date: Fri, 18 Apr 2025 12:48:47 +0200
Subject: [PATCH] [mod] role:murmur

---
 roles/murmur/defaults/main.json             | 14 ++++++++------
 roles/murmur/tasks/main.json                | 12 ++++++------
 roles/murmur/templates/mumble-server.ini.j2 |  6 +++---
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/roles/murmur/defaults/main.json b/roles/murmur/defaults/main.json
index 2f81b61..e16864f 100644
--- a/roles/murmur/defaults/main.json
+++ b/roles/murmur/defaults/main.json
@@ -1,8 +1,10 @@
 {
-	"var_murmur_database_path": "/var/lib/mumble-server/mumble-server.sqlite",
-	"var_murmur_domain": "murmur.example.org",
-	"var_murmur_port": 64738,
-	"var_murmur_welcome_text": "<br />Welcome to this server running <b>Murmur</b>.<br />Enjoy your stay!<br />",
-	"var_murmur_admin_password": "REPLACE_ME",
-	"var_murmur_tls": true
+	"cfg_murmur": {
+		"database_path": "/var/lib/mumble-server/mumble-server.sqlite",
+		"domain": "murmur.example.org",
+		"port": 64738,
+		"welcome_text": "<br />Welcome to this server running <b>Murmur</b>.<br />Enjoy your stay!<br />",
+		"admin_password": "REPLACE_ME",
+		"tls": true
+	}
 }
diff --git a/roles/murmur/tasks/main.json b/roles/murmur/tasks/main.json
index f6c84a6..9413c55 100644
--- a/roles/murmur/tasks/main.json
+++ b/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/fullchains/{{var_murmur_domain}}.pem", "to": "/var/murmurd/tls-fullchain.pem"}
+			{"from": "/etc/ssl/private/{{cfg_murmur.domain}}.pem", "to": "/var/murmurd/tls-key.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"
 		}
 	},
diff --git a/roles/murmur/templates/mumble-server.ini.j2 b/roles/murmur/templates/mumble-server.ini.j2
index 37ea8ce..9e05bc2 100644
--- a/roles/murmur/templates/mumble-server.ini.j2
+++ b/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.