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

fixes

Browse source
This commit is contained in:
root 2012-10-25 19:52:59 +02:00
parent 91ce44d6d0
commit 7648b641e2
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
yunohost.py
View file

@ -125,7 +125,7 @@ def get_required_args(args, required_args, password=False):
else:
raise Exception #FIX
# Password
if not 'password' in args and password and 'password' in required_args:
if 'password' not in args and password and 'password' in required_args:
if os.isatty(1):
args['password'] = getpass.getpass(colorize(required_args['password'] + ': ', 'cyan'))
pwd2 = getpass.getpass(colorize('Retype ' + required_args['password'][0].lower() + required_args['password'][1:] + ': ', 'cyan'))

29
yunohost_tools.py
View file

@ -163,24 +163,25 @@ def tools_postinstall(args, connections):
dict
"""
with get_required_args(args, {'domain' : _('Main domain name'), 'password' : _('New admin password') }, True) as args:
args = get_required_args(args, {'domain' : _('Main domain name'), 'password' : _('New admin password') }, True)
try:
with open('/usr/share/yunohost/yunohost-config/others/installed') as f: pass
except IOError:
print('Installing YunoHost')
else:
raise YunoHostError(17, _("YunoHost is already installed"))
try:
with open('/usr/share/yunohost/yunohost-config/others/installed') as f: pass
except IOError:
print('Installing YunoHost')
else:
raise YunoHostError(17, _("YunoHost is already installed"))
# Initialize YunoHost LDAP base
tools_ldapinit(args, connections)
# Initialize YunoHost LDAP base
tools_ldapinit(args, connections)
# Change LDAP admin password
tools_adminpw({ 'old' : 'yunohost', 'new' : args['password']})
print(args)
# Change LDAP admin password
tools_adminpw({ 'old' : 'yunohost', 'new' : args['password']})
# New domain config
tools_maindomain({ 'old' : 'yunohost.org', 'new' : args['domain']})
# New domain config
tools_maindomain({ 'old' : 'yunohost.org', 'new' : args['domain']})
os.system('touch /usr/share/yunohost/yunohost-config/others/installed')
os.system('touch /usr/share/yunohost/yunohost-config/others/installed')
return { 'Success' : _("YunoHost has been successfully configured") }