diff --git a/Vagrantfile b/Vagrantfile index fb66bca6e42294479c8047565c2f090e403b2d1a..83955fb60159adaaaf33752315ae6977669e9097 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 3a71a0b7a13deb2042b8382e93116b7d388f0f76..d490795f58737d837484b42b0539e6bb9acd8d0a 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