From d12a09a98ec94917bd2bee8e2e027db6a510d45b Mon Sep 17 00:00:00 2001
From: downhill <downhill@geekhabitat.de>
Date: Tue, 23 Oct 2018 16:56:12 +0200
Subject: [PATCH] some minor changes for settings

---
 dal/dal/settings.py          |  4 ++--
 dal/djangoldap.conf.example  |  5 -----
 dal/userservice.conf.example | 13 +++++++++++++
 3 files changed, 15 insertions(+), 7 deletions(-)
 delete mode 100644 dal/djangoldap.conf.example
 create mode 100644 dal/userservice.conf.example

diff --git a/dal/dal/settings.py b/dal/dal/settings.py
index acd7ac8..2bf5a7c 100644
--- a/dal/dal/settings.py
+++ b/dal/dal/settings.py
@@ -19,7 +19,7 @@ from django_auth_ldap.config import LDAPSearch, LDAPSearchUnion
 from configparser import ConfigParser
 
 config = ConfigParser()
-config.read('djangoldap.conf')
+config.read('userservice.conf')
 
 # LDAP config
 
@@ -54,7 +54,7 @@ AUTH_LDAP_USER_SEARCH = LDAPSearchUnion(
 
 # Where's the Rabbitmq at
 NAMEKO_CONFIG = { 
-        'AMQP_URI': 'amqp://guest:guest@127.0.0.1'
+        'AMQP_URI': 'amqp://%s' % config['System']['RABBITMQ']
     }
 
 # Standard pool size
diff --git a/dal/djangoldap.conf.example b/dal/djangoldap.conf.example
deleted file mode 100644
index e44099d..0000000
--- a/dal/djangoldap.conf.example
+++ /dev/null
@@ -1,5 +0,0 @@
-[LDAP]
-
-# Set up the user which can search
-SEARCHUSER = uid=search,ou=system,dc=ungleich,dc=ch
-SEARCHUSERPASSWORD = fnord
diff --git a/dal/userservice.conf.example b/dal/userservice.conf.example
new file mode 100644
index 0000000..6ab0867
--- /dev/null
+++ b/dal/userservice.conf.example
@@ -0,0 +1,13 @@
+[System]
+
+# Set up where the RabbitMQ is at and user:password
+
+RABBITMQ = guest:guest@127.0.0.1
+
+[LDAP]
+
+# Set up the user who can search
+SEARCHUSER = uid=search,ou=system,dc=ungleich,dc=ch
+SEARCHUSERPASSWORD = fnord
+
+