From f673d827179e0e55f9662a25fffababd56b5ab7c Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Tue, 14 Oct 2014 17:23:14 +0100
Subject: [PATCH] make default site an argument of scripts/setup.sh
---
Vagrantfile | 2 +-
scripts/setup.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Vagrantfile b/Vagrantfile
index 0a03b2c..dcaab64 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -45,7 +45,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
core.vm.synced_folder ".", "/data/infrastructure", id: "coreos-infrastructure", :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: "cp /data/infrastructure/scripts/unsecure-certs/*.pem /data/server-wide/haproxy/approved-certs"
- core.vm.provision :shell, path: "./scripts/setup.sh"
+ core.vm.provision :shell, path: "./scripts/setup.sh", args: [HOSTNAME]
core.vm.provision :shell, inline: "etcdctl set /services/default '{\"app\":\"nginx\", \"hostname\":\"#{HOSTNAME}\"}'"
core.vm.provision :shell, path: "./scripts/approve-user.sh", args: [HOSTNAME, "nginx"]
end
diff --git a/scripts/setup.sh b/scripts/setup.sh
index bed7870..4423360 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -16,7 +16,7 @@ docker pull indiehosters/wordpress
docker pull indiehosters/nginx
# Activate default domain
-etcdctl set /services/default '{"app":"nginx", "hostname":"`hostname`"}'
+etcdctl set /services/default '{"app":"nginx", "hostname":"'$1'"}'
# Configure and start HAproxy
mkdir -p /data/server-wide/haproxy/approved-certs
--
GitLab