diff --git a/services.py b/services.py index 2d213e3..ea1c72b 100644 --- a/services.py +++ b/services.py @@ -146,21 +146,21 @@ def services_to_time_mail_bienvenue(x): # génération des arguments du service à redémarrer (par defaut []) services_to_args={} -services_to_args['macip']=services_to_args_macip +services_to_args['macip'] = services_to_args_macip ## Inutile pour blackliste pour le moment #services_to_args['blacklist']=services_to_args_blacklist -services_to_args['port']=services_to_args_port -services_to_args['dns']=services_to_args_dns -services_to_args['home']=services_to_args_home +services_to_args['port'] = services_to_args_port +services_to_args['dns'] = services_to_args_dns +services_to_args['home'] = services_to_args_home services_to_args['mail_ajout_droits'] = lambda x: "%s:%s" % (x.parent['uid'][0], x) -services_to_args['del_user']=services_to_args_del_user -services_to_args['mail_bienvenue']=services_to_args_mail_bienvenue -services_to_args['mail_modif']=services_to_args_mail_modif +services_to_args['del_user'] = services_to_args_del_user +services_to_args['mail_bienvenue'] = services_to_args_mail_bienvenue +services_to_args['mail_modif'] = services_to_args_mail_modif # Quand redémarrer le service (par defaut [0]), doit returner un iterable avec potentiellement plusieurs dates services_to_time={} -services_to_time['blacklist']=services_to_time_blacklist -services_to_time['mail_bienvenue']=services_to_time_mail_bienvenue +services_to_time['blacklist'] = services_to_time_blacklist +services_to_time['mail_bienvenue'] = services_to_time_mail_bienvenue attrs_to_services = {} for (key, values) in services_to_attrs.items(): @@ -322,8 +322,9 @@ def services_to_restart(conn, old_attrs={}, new_attrs={}, created_object=[], del # Je met la reconfiguration du home / del_user à la main pour la création/suppression d'un compte crans # parce que que je vois pas vraiement comment faire autrement if 'cransAccount' in added_objectClass + updated_objectClass: - arg = services_to_args['home'](old_attrs, new_attrs) - service_to_restart(conn, "home", list(arg), 0) + if str(new_attrs.get('uid', [''])) != str(old_attrs.get(['uid'], [''])): + arg = services_to_args['home'](old_attrs, new_attrs) + service_to_restart(conn, "home", list(arg), 0) if 'cransAccount' in deleted_objectClass: service_to_restart(conn, "del_user", ["%s,%s" % (old_attrs['uid'][0], old_attrs['homeDirectory'][0])], 0)