From dceb77dc260f360c5d14ef59bad489e799bc75e6 Mon Sep 17 00:00:00 2001
From: Alex <caskd@420blaze.it>
Date: Thu, 4 Jun 2020 14:36:49 +0200
Subject: [PATCH] Fix name and bandwidth, remove vault inclusion

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

diff --git a/tasks/main.yml b/tasks/main.yml
index 20e246f..d4a26dc 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,9 +1,3 @@
-- name: Include sensitive info
-  include_vars:
-        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' }
diff --git a/templates/murmur.ini.j2 b/templates/murmur.ini.j2
index 818be1f..a4015e5 100644
--- a/templates/murmur.ini.j2
+++ b/templates/murmur.ini.j2
@@ -4,13 +4,14 @@ dbUsername={{ murmur.database.username|default("murmur") }}
 dbPassword={{ murmur.database.password }}
 dbHost={{ murmur.database.host|default("localhost") }}
 dbPort={{ murmur.database.port|default(5432) }}
-registerName="{{ murmur.register.host }}"
+registerName="{{ murmur.name }}"
 registerPassword={{ murmur.register.password }}
 registerUrl=https://{{ murmur.register.url }}/
 registerHostname={{ murmur.register.host }}
 host={{ murmur.listen.host|default("0.0.0.0 ::") }}
 uname={{ murmur.username|default("nobody") }}
 opusthreshold=10
+bandwidth=130000
 port={{ murmur.listen.port|default(51413) }}
 defaultchannel={{ murmur.defaultchan|default(0) }}
 welcometext="