From 8f993af465488f8bf62219e118095b088b11002c Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Thu, 28 Nov 2013 16:34:50 -0800 Subject: [PATCH] move config script last in chain so it wins remove TODO --- launcher | 7 +++++-- templates/web.template.yml | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/launcher b/launcher index 32eedc6..040e59c 100755 --- a/launcher +++ b/launcher @@ -67,8 +67,8 @@ case "$command" in "require 'yaml'; puts YAML.load(STDIN.readlines.join)['templates']"` arrTemplates=(${templates// / }) - input=$(cat $config_file) - + config=$(cat $config_file) + input="hack: true" for template in "${arrTemplates[@]}" do @@ -77,6 +77,9 @@ case "$command" in } done + # we always want our config file last so it takes priority + input="$input _FILE_SEPERATOR_ $config" + set_volumes rm -f $cidbootstrap diff --git a/templates/web.template.yml b/templates/web.template.yml index 595c926..fa318e6 100644 --- a/templates/web.template.yml +++ b/templates/web.template.yml @@ -22,10 +22,11 @@ params: database: discourse username: discourse socket: /var/run/postgresql - password: - host: - host_names: - - YOUR_HOSTNAME_HERE +# TODO allow param here? + # password: + # host: + # host_names: + # - YOUR_HOSTNAME_HERE run: -- 2.25.1