diff options
| author | kwadronaut <kwadronaut@leap.se> | 2016-12-06 20:39:28 +0100 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2016-12-06 20:40:31 +0100 |
| commit | 98590ee190375dd7b6a43f41ffd9e8d019600680 (patch) | |
| tree | 4a39b423524f30881a8e8021ab3761ce8cb07340 /scripts | |
| parent | f10ab744ca314fc4d53ee288cd086c98fb41239a (diff) | |
| parent | bd4e54fcbc59bf9d775c177beabc65543cc233c6 (diff) | |
Merge remote-tracking branch 'refs/remotes/KwadroNaut/develop'
Conflicts:
scripts/base.sh
scripts/custom.sh
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/custom.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/custom.sh b/scripts/custom.sh index e141f39..9ed5ceb 100644 --- a/scripts/custom.sh +++ b/scripts/custom.sh @@ -4,13 +4,13 @@ sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config # install additional packages -# openssl is needed to set root pw later -apt-get -y install leap-archive-keyring puppet lsb-release facter rsync curl openssl bash-completion wget sudo +# LEAP people like some of these: see also #6898 and https://github.com/leapcode/leap_cli/pull/17 + +apt-get -y install leap-archive-keyring puppet lsb-release facter rsync curl bash-completion wget sudo unzip vim tmux ntp git rdoc # Don't use client locales # https://stackoverflow.com/questions/29609371/how-do-not-pass-locale-through-ssh sed 's/^AcceptEnv.*//' /etc/ssh/sshd_config - # Set root pw -usermod -p "$(echo vagrant | openssl passwd -1 -stdin)" root +echo 'root:vagrant' | chpasswd |