Commit 901b13ee authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

Merge remote-tracking branch 'origin/passwd-l'

Conflicts:
	slapprepare/slapprepare/__init__.py
parents ea093c7a 93663ddf
......@@ -84,11 +84,6 @@ else
sed -i "/${SLAPVPN}/ s/^\([^#]\)/#\1/g" $SLAPOS_CONFIGURATION/slapos.cfg
fi
# set random root password
pwgen -sync 512 1 | passwd --stdin root
SLAP_INSTALL_LOG=/opt/slapos/slapos-install.log
while :; do
......
......@@ -324,6 +324,9 @@ def slapserver(config):
if not dry_run:
os.remove(path)
# Disable login by password for root
_call(['passwd','-d','root'])
finally:
print "SlapOS Image configuration: DONE"
return 0
......
PermitRootLogin yes
PermitRootLogin without-password
AllowUsers root
AddressFamily any
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment