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

fuck.

Browse source
This commit is contained in:
root 2012-10-25 19:52:52 +02:00
parent a6c2e87be1
commit 277c081ac0
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
yunohost.py
View file

@ -125,14 +125,15 @@ def get_required_args(args, required_args, password=False):
else: else:
raise Exception #FIX raise Exception #FIX
# Password # Password
if args['password'] is None and 'password' in required_args and password: if 'password' in required_args and password:
if os.isatty(1): if not args['password']:
args['password'] = getpass.getpass(colorize(required_args['password'] + ': ', 'cyan')) if os.isatty(1):
pwd2 = getpass.getpass(colorize('Retype ' + required_args['password'][0].lower() + required_args['password'][1:] + ': ', 'cyan')) args['password'] = getpass.getpass(colorize(required_args['password'] + ': ', 'cyan'))
if args['password'] != pwd2: pwd2 = getpass.getpass(colorize('Retype ' + required_args['password'][0].lower() + required_args['password'][1:] + ': ', 'cyan'))
raise YunoHostError(22, _("Passwords doesn't match")) if args['password'] != pwd2:
else: raise YunoHostError(22, _("Passwords doesn't match"))
raise YunoHostError(22, _("Missing arguments")) else:
raise YunoHostError(22, _("Missing arguments"))
except KeyboardInterrupt, EOFError: except KeyboardInterrupt, EOFError:
raise YunoHostError(125, _("Interrupted, YunoHost not configured")) raise YunoHostError(125, _("Interrupted, YunoHost not configured"))

2
yunohost_tools.py
View file

@ -173,7 +173,7 @@ def tools_postinstall(args, connections):
raise YunoHostError(17, _("YunoHost is already installed")) raise YunoHostError(17, _("YunoHost is already installed"))
# Initialize YunoHost LDAP base # Initialize YunoHost LDAP base
tools_ldapinit(args, connections) #tools_ldapinit(args, connections)
# Change LDAP admin password # Change LDAP admin password
tools_adminpw({ 'old' : 'yunohost', 'new' : args['password']}) tools_adminpw({ 'old' : 'yunohost', 'new' : args['password']})