chgpass, ldap_crans: secrets_new

This commit is contained in:
Daniel STAN 2013-11-07 23:00:46 +01:00
parent e8700aa131
commit bba2b1cf9b
2 changed files with 8 additions and 10 deletions

View file

@ -22,12 +22,9 @@ import getpass, commands, os, sys, base64, syslog
from user_tests import getuser, isadm from user_tests import getuser, isadm
from affich_tools import cprint from affich_tools import cprint
try : import secrets_new as secrets
sys.path.append('/usr/scripts/gestion/secrets') ldap_password = secrets.get("ldap_password")
from secrets import ldap_password, ldap_auth_dn ldap_auth_dn = secrets.get("ldap_auth_dn")
except :
ldap_password = ''
ldap_auth_dn = ''
uri = 'ldap://ldap.adm.crans.org' uri = 'ldap://ldap.adm.crans.org'
syslog.openlog('chgpass',syslog.LOG_PID,syslog.LOG_AUTH) syslog.openlog('chgpass',syslog.LOG_PID,syslog.LOG_AUTH)

View file

@ -25,6 +25,7 @@ from email_tools import send_email
from syslog import openlog, closelog, syslog from syslog import openlog, closelog, syslog
from numeros_disponibles import lister_ip_dispo from numeros_disponibles import lister_ip_dispo
from unicodedata import normalize from unicodedata import normalize
import secrets_new as secrets
import ridtools import ridtools
date_format = '%d/%m/%Y %H:%M' date_format = '%d/%m/%Y %H:%M'
@ -63,8 +64,8 @@ elif hostname in test_hosts:
# avec le secret # avec le secret
try: try:
sys.path.append('/usr/scripts/gestion/secrets') ldap_auth_dn = secrets.get('ldap_auth_dn')
from secrets import ldap_password, ldap_auth_dn ldap_password = secrets.get('ldap_password')
except: except:
sys.stdout.write(coul('Warning : impossible de lire le fichier de secret !\n', 'jaune')) sys.stdout.write(coul('Warning : impossible de lire le fichier de secret !\n', 'jaune'))
sys.exit(1) sys.exit(1)
@ -80,8 +81,8 @@ else:
# avec le secret # avec le secret
try: try:
sys.path.append('/usr/scripts/gestion/secrets') ldap_auth_dn = secrets.get('ldap_auth_dn')
from secrets import ldap_password, ldap_auth_dn ldap_password = secrets.get('ldap_password')
except: except:
sys.stdout.write(coul('Warning : impossible de lire le fichier de secret !\n', 'jaune')) sys.stdout.write(coul('Warning : impossible de lire le fichier de secret !\n', 'jaune'))
sys.exit(1) sys.exit(1)