Merge branch 'baserock/richardipsum/http_v3' into baserock/masterbaserock/master

Reviewed-by:
    Daniel Silverstone
    Richard Maw

1 files changed, 2 insertions, 0 deletions

diff --git a/bin/gitano-setup.in b/bin/gitano-setup.in
index fbfa58a..61a3246 100644
--- a/bin/gitano-setup.in
+++ b/bin/gitano-setup.in
@@ -161,6 +161,7 @@ validate_name(ask_for("admin.keyname", "Key name for administrator",
 
 ask_for("site.name", "Site name", "a random Gitano instance")
 ask_for("log.prefix", "Site log prefix", "gitano")
+ask_for("use.htpasswd", "Store passwords with htpasswd? (needed for http authentication)", "no")
 
 gitano.log.chat("Step 2: Gather required content")
 
@@ -169,6 +170,7 @@ local completely_flat = {}
 local site_conf = clod.parse("")
 site_conf.settings["site_name"] = get "site.name"
 site_conf.settings["log.prefix"] = get "log.prefix"
+site_conf.settings["use_htpasswd"] = get "use.htpasswd"
 completely_flat["site.conf"] = site_conf:serialise()
 
 -- Acquire the contents of the skeleton gitano-admin repository