ungleich-public/ungleich-user
6
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

some minor changes for settings

Browse source
This commit is contained in:
downhill 2018-10-23 16:56:12 +02:00
parent 955d894d64
commit d12a09a98e
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dal/dal/settings.py
View file

@ -19,7 +19,7 @@ from django_auth_ldap.config import LDAPSearch, LDAPSearchUnion
from configparser import ConfigParser from configparser import ConfigParser
config = ConfigParser() config = ConfigParser()
config.read('djangoldap.conf') config.read('userservice.conf')
# LDAP config # LDAP config
@ -54,7 +54,7 @@ AUTH_LDAP_USER_SEARCH = LDAPSearchUnion(
# Where's the Rabbitmq at # Where's the Rabbitmq at
NAMEKO_CONFIG = { NAMEKO_CONFIG = {
'AMQP_URI': 'amqp://guest:guest@127.0.0.1' 'AMQP_URI': 'amqp://%s' % config['System']['RABBITMQ']
} }
# Standard pool size # Standard pool size

5
dal/djangoldap.conf.example
View file

@ -1,5 +0,0 @@
[LDAP]
# Set up the user which can search
SEARCHUSER = uid=search,ou=system,dc=ungleich,dc=ch
SEARCHUSERPASSWORD = fnord

13
dal/userservice.conf.example Normal file
View file

@ -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