crans/crans_bcfg2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ldap.py] ldap_host contient désormais un host

Browse source
This commit is contained in:
Daniel STAN 2013-05-19 21:51:27 +02:00
parent b6e9d79019
commit 5fa6339cd0
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Python/etc/freeradius/modules/ldap
View file

@ -1,11 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
include("secrets") include("secrets")
include("ldap")
if has("db-replicat"):
server = 'localhost'
else:
server = 'ldap.adm.crans.org'
print """ print """
# -*- text -*- # -*- text -*-
# ceci est le fichier /etc/freeradius/modules/ldap # ceci est le fichier /etc/freeradius/modules/ldap
@ -177,4 +174,4 @@ ldap {
# default: 0x0000 (no debugging messages) # default: 0x0000 (no debugging messages)
# Example:(LDAP_DEBUG_FILTER+LDAP_DEBUG_CONNS) # Example:(LDAP_DEBUG_FILTER+LDAP_DEBUG_CONNS)
#ldap_debug = 0x0028 #ldap_debug = 0x0028
}""" % {'password': secrets.ldap_readonly_password, 'server': server} }""" % {'password': secrets.ldap_readonly_password, 'server': ldap_host}

2
Python/etc/nsswitch.conf
View file

@ -7,6 +7,8 @@ Databases) et du service de noms (Name Service Switch).
if has("ldap"): if has("ldap"):
db="ldap" db="ldap"
else:
db=""
def database(name, res): def database(name, res):
print name + ": " + " ".join(res) print name + ": " + " ".join(res)

2
etc/genshi/postfix_ldap.txt
View file

@ -16,7 +16,7 @@
{% include /var/lib/bcfg2/etc/genshi/secrets.txt %}\ {% include /var/lib/bcfg2/etc/genshi/secrets.txt %}\
# Connexion LDAP # Connexion LDAP
server_host = $ldap_host server_host = $ldap_socket
search_base = ou=data,dc=crans,dc=org search_base = ou=data,dc=crans,dc=org
version = 3 version = 3
bind = yes bind = yes

6
etc/python/ldap.py
View file

@ -12,12 +12,12 @@ include("ip")
if has("db-server") and not has("db-replicat-test"): if has("db-server") and not has("db-replicat-test"):
# Pour ceux qui ont la base ou une copie en locale # Pour ceux qui ont la base ou une copie en locale
# on regarde dans celle-ci # on regarde dans celle-ci
ldap_host = "ldap://127.0.0.1/" ldap_host = "127.0.0.1"
ldap_socket = "ldapi://%2fvar%2frun%2fslapd%2fldapi/" ldap_socket = "ldapi://%2fvar%2frun%2fslapd%2fldapi/"
else: else:
# On regarde dans la base principale # On regarde dans la base principale
ldap_host = "ldap://%s/" % admipof("ldap") ldap_host = admipof("ldap")
ldap_socket = ldap_host ldap_socket = "ldap://%s/" % ldap_host
# Filtre de droits pour la connexion # Filtre de droits pour la connexion
if has("users") or has("vert"): if has("users") or has("vert"):