From 408cb9a39ee1f276c7c3428347f016fc199d9531 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Mon, 27 Oct 2014 14:55:49 +0000
Subject: [PATCH] Fixes Vagrantfile to work with confd
---
Vagrantfile | 4 +---
scripts/setup.sh | 7 +++++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Vagrantfile b/Vagrantfile
index bbc38d6..ed8a35d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -44,10 +44,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
core.vm.network :private_network, ip: "#{BASE_IP_ADDR}.#{i+1}"
core.vm.synced_folder ".", "/data/indiehosters", id: "coreos-indiehosters", :nfs => true, :mount_options => ['nolock,vers=3,udp']
core.vm.provision :file, source: "./cloud-config", destination: "/tmp/vagrantfile-user-data"
+ core.vm.provision :shell, inline: "mkdir -p /data/server-wide/haproxy/approved-certs; cp /data/indiehosters/scripts/unsecure-certs/*.pem /data/server-wide/haproxy/approved-certs"
core.vm.provision :shell, path: "./scripts/setup.sh", args: [HOSTNAME]
- core.vm.provision :shell, inline: "cp /data/indiehosters/scripts/unsecure-certs/*.pem /data/server-wide/haproxy/approved-certs"
- core.vm.provision :shell, inline: "etcdctl set /services/default '{\"app\":\"nginx\", \"hostname\":\"#{HOSTNAME}\"}'"
- core.vm.provision :shell, path: "./scripts/activate-user.sh", args: [HOSTNAME, "nginx"]
end
end
end
diff --git a/scripts/setup.sh b/scripts/setup.sh
index ed35b6d..a57a8fb 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -16,12 +16,15 @@ docker pull indiehosters/postfix-forwarder
docker pull indiehosters/nginx
# Activate default domain
+sh /data/indiehosters/scripts/activate-user.sh $1 nginx
etcdctl set /services/default '{"app":"nginx", "hostname":"'$1'"}'
# Configure and start HAproxy
mkdir -p /data/server-wide/haproxy/approved-certs
-systemctl enable haproxy.service
-systemctl start haproxy.service
+systemctl enable haproxy-confd.service
+systemctl start haproxy-confd.service
+systemctl enable haproxy.path
+systemctl start haproxy.path
# Configure and start postfix
mkdir -p /data/server-wide/postfix
--
GitLab