move config script last in chain so it wins

remove TODO

diff --git a/launcher b/launcher
index 32eedc6be1a8ac8ff65fac788d41532349777825..040e59cc12c3fa11842fd7302b8d7fe6a633759c 100755 (executable)
--- 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 595c926404020e7b9d81e3547ed112496b084b92..fa318e60887165168f76647ca5844082faebd97b 100644 (file)
--- 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: