YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #975 from YunoHost/auto-restart-ldap

Browse source 
[fix] handle new auto restart of ldap in moulinette
This commit is contained in:
Alexandre Aubin 2020-05-07 22:18:18 +02:00 • committed by GitHub
commit 6434fad965
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/yunohost/utils/ldap.py
View file

@ -21,6 +21,7 @@
import os import os
import atexit import atexit
from moulinette.core import MoulinetteLdapIsDownError
from moulinette.authenticators import ldap from moulinette.authenticators import ldap
from yunohost.utils.error import YunohostError from yunohost.utils.error import YunohostError
@ -34,8 +35,6 @@ def _get_ldap_interface():
if _ldap_interface is None: if _ldap_interface is None:
assert_slapd_is_running()
conf = { "vendor": "ldap", conf = { "vendor": "ldap",
"name": "as-root", "name": "as-root",
"parameters": { 'uri': 'ldapi://%2Fvar%2Frun%2Fslapd%2Fldapi', "parameters": { 'uri': 'ldapi://%2Fvar%2Frun%2Fslapd%2Fldapi',
@ -44,7 +43,12 @@ def _get_ldap_interface():
"extra": {} "extra": {}
} }
_ldap_interface = ldap.Authenticator(**conf) try:
_ldap_interface = ldap.Authenticator(**conf)
except MoulinetteLdapIsDownError:
raise YunohostError("Service slapd is not running but is required to perform this action ... You can try to investigate what's happening with 'systemctl status slapd'")
assert_slapd_is_running()
return _ldap_interface return _ldap_interface