Revert "Revert "Merge branch 'master' into pull_request_workflow""

This reverts commit 04ff19c726.
This commit is contained in:
Dennis Gilmore
2017-02-20 08:00:14 -06:00
parent 04ff19c726
commit b4acbdc337
3 changed files with 12 additions and 7 deletions

View File

@@ -45,7 +45,7 @@ systemctl mask cloud-init cloud-init-local cloud-config cloud-final
# Vagrant setup
sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
mkdir -m 0700 -p ~vagrant/.ssh
cat > ~vagrant/.ssh/authorized_keys << EOKEYS