summaryrefslogtreecommitdiff
path: root/bin/gitano-setup.in
diff options
context:
space:
mode:
Diffstat (limited to 'bin/gitano-setup.in')
-rw-r--r--bin/gitano-setup.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/gitano-setup.in b/bin/gitano-setup.in
index f2ef21b..61a3246 100644
--- a/bin/gitano-setup.in
+++ b/bin/gitano-setup.in
@@ -73,7 +73,7 @@ function ask_for(key, prompt, default)
local default_str = (cur_value == nil) and "" or " [" .. tostring(cur_value) .. "]"
sio.stdout:write((prompt or key) .. default_str .. ": ")
local new_value = sio.stdin:read("*l")
- if new_value ~= "" then
+ if new_value and new_value ~= "" then
cur_value = new_value
end
end
@@ -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