From 654b9730f223f3137b97aa4c08acfc8ffe829540 Mon Sep 17 00:00:00 2001
From: Alex <caskd@420blaze.it>
Date: Sun, 24 May 2020 14:41:39 +0200
Subject: [PATCH] Fix some paths

---
 tasks/main.yml          | 9 ++++++---
 templates/murmur.ini.j2 | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index e4e9db3..20e246f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,13 +1,16 @@
 - name: Include sensitive info
   include_vars:
-        dir: '/vault/main.yml'
+        dir: '{{ role_path }}/vault'
   tags:
+        - murmur
         - vault
 - name: Copy configuration
+  loop:
+        - { src: 'murmur.ini', dest: '{{ murmur.configpath }}/mumble-server.ini', mode: '600', owner: 'root', group: 'root' }
   template:
         follow: yes
-        src: 'murmur.ini.j2'
-        dest: '{{ murmur.configpath }}/mumble-server.ini'
+        src: '{{ item.src }}.j2'
+        dest: '{{ item.dest }}'
   tags:
         - murmur
         - vault
diff --git a/templates/murmur.ini.j2 b/templates/murmur.ini.j2
index 5a5729e..818be1f 100644
--- a/templates/murmur.ini.j2
+++ b/templates/murmur.ini.j2
@@ -4,7 +4,7 @@ dbUsername={{ murmur.database.username|default("murmur") }}
 dbPassword={{ murmur.database.password }}
 dbHost={{ murmur.database.host|default("localhost") }}
 dbPort={{ murmur.database.port|default(5432) }}
-registerName="{{ murmur.database.name }}"
+registerName="{{ murmur.register.host }}"
 registerPassword={{ murmur.register.password }}
 registerUrl=https://{{ murmur.register.url }}/
 registerHostname={{ murmur.register.host }}