From 732bd9ddadb9448cfe06a676f1811ba23b4d3495 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Wed, 8 Oct 2014 17:58:17 +0100
Subject: [PATCH] Revert bad commit - permission issue
---
Vagrantfile | 2 +-
scripts/setup.sh | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Vagrantfile b/Vagrantfile
index fb66bca..83955fb 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -43,7 +43,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
core.vm.network :private_network, ip: "#{BASE_IP_ADDR}.#{i+1}"
core.vm.synced_folder ".", "/data/infrastructure"
core.vm.synced_folder "/data/per-user", "/data/per-user"
- core.vm.provision :file, source: "./config/user-data", destination: "/var/lib/coreos-vagrant/vagrantfile-user-data"
+ core.vm.provision :file, source: "./config/user-data", destination: "/tmp/vagrantfile-user-data"
core.vm.provision :shell, path: "./scripts/setup.sh"
core.vm.provision :shell, path: "./scripts/approve-user.sh", args: [HOSTNAME, "nginx"]
end
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 3a71a0b..d490795 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -1,5 +1,8 @@
#!/bin/bash -eux
+# Install cloud-config
+mv /tmp/vagrantfile-user-data /var/lib/coreos-vagrant/vagrantfile-user-data
+
# Install unit-files
cp /data/infrastructure/unit-files/* /etc/systemd/system
systemctl daemon-reload
--
GitLab