summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jessie.json2
-rw-r--r--scripts/vagrant.sh13
2 files changed, 10 insertions, 5 deletions
diff --git a/jessie.json b/jessie.json
index a7dc84c..d7ab526 100644
--- a/jessie.json
+++ b/jessie.json
@@ -121,7 +121,7 @@
"artifact_type": "vagrant.box",
"metadata": {
"provider": "libvirt",
- "version": "0.0.1"
+ "created_at": "{{timestamp}}"
}
}]
]
diff --git a/scripts/vagrant.sh b/scripts/vagrant.sh
index 694486b..1cb2659 100644
--- a/scripts/vagrant.sh
+++ b/scripts/vagrant.sh
@@ -6,10 +6,15 @@
date > /etc/vagrant_box_build_time
# Installing vagrant keys
-mkdir -pm 700 /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys
-chmod 0600 /home/vagrant/.ssh/authorized_keys
-chown -R vagrant /home/vagrant/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /tmp/vagrant.pub
+
+for user in vagrant root
+do
+ mkdir -pm 700 /home/${user}/.ssh
+ chmod 0600 /home/${user}/.ssh/authorized_keys
+ cp /tmp/vagrant.pub /home/${user}/.ssh/authorized_keys
+ chown -R ${user} /home/${user}/.ssh
+done
# configure password-less sudo
echo 'vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers