Merge commit 'bfe458e83c0157879767976ba97bf95d1e27918c'

[shellwiki] / index.cgi

diff --git a/index.cgi b/index.cgi
index 8975ccaa0cc1b2b6e76d4f8d13474648ca0d1311..db4d749b7c179efde9b4fec43a5158c5e4dd4d21 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -2,11 +2,17 @@
 
 . "${_EXEC:-${0%/*}}/cgilite/cgilite.sh"
 . "${_EXEC}/cgilite/session.sh"
-. "${_EXEC}/cgilite/file.sh"
 . "${_EXEC}/cgilite/users.sh"
 . "${_EXEC}/tools.sh"
 . "${_EXEC}/acl.sh"
 
+REV_ATTACHMENTS=${REV_ATTACHMENTS:-false}
+WIKI_THEME="${WIKI_THEME:-default}"
+. "${_EXEC}/themes/${WIKI_THEME}.sh"
+
+# Renew session cookie, only if cookie already set
+[ "$(COOKIE session)" ] && SESSION_COOKIE
+
 wiki_text() {
   # Print source text of a wiki page
   # Get page from data or underlay dir
@@ -17,6 +23,21 @@ wiki_text() {
   cat -- "$mdfile"
 }
 
+if [ "$(which git)" -a ! -f "$_DATA/.gitignore" ]; then
+  cat >"$_DATA/.gitignore" <<-EOF
+       users.db
+       serverkey
+       $([ "$REV_ATTACHMENTS" = true ] || printf %s "**/#attachments/")
+       **/#cache/
+       **/#page.lock
+       **/#page.*.cache
+       **/#page.*.cache.*
+       EOF
+  git init "$_DATA"
+  git -C "$_DATA" add .gitignore
+  git -C "$_DATA" commit -m 'initialization' -- .gitignore
+fi 1>&2
+
 for handler in "$_EXEC"/handlers/*; do
   . "$handler" && break
 done