Merge commit '6bc502434737d7f08379e79b94fc6fda424ef779'

[shellwiki] / index.cgi

diff --git a/index.cgi b/index.cgi
index a426e0e7ec9db5b136d5f7da90ae265e88b09bf4..c121c3879b050597602b80cb8e39845254fdf737 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -14,21 +14,22 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
 # IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+export REV_PAGES=${REV_PAGES:-true}
+export REV_ATTACHMENTS=${REV_ATTACHMENTS:-false}
+export WIKI_THEME="${WIKI_THEME:-default}"
+export SEARCH_INDEX="${SEARCH_INDEX:-true}"
+export USER_AUTH="${USER_AUTH:-default}"
+
 . "${_EXEC:-${0%/*}}/cgilite/cgilite.sh"
 . "${_EXEC}/cgilite/session.sh"
-. "${_EXEC}/cgilite/users.sh"
+. "${_EXEC}/auth/${USER_AUTH}.sh"
 . "${_EXEC}/tools.sh"
 . "${_EXEC}/acl.sh"
-
-export REV_PAGES=${REV_PAGES:-true}
-export REV_ATTACHMENTS=${REV_ATTACHMENTS:-false}
-export WIKI_THEME="${WIKI_THEME:-default}"
+. "${_EXEC}/themes/${WIKI_THEME}.sh"
 
 which git >/dev/null || REV_PAGES=false
 [ "$REV_PAGES" != true ] && REV_ATTACHMENTS=false
 
-. "${_EXEC}/themes/${WIKI_THEME}.sh"
-
 # Renew session cookie, only if cookie already set
 [ "$(COOKIE session)" ] && SESSION_COOKIE
 
@@ -46,12 +47,15 @@ if [ "$REV_PAGES" = true -a ! -f "$_DATA/.gitignore" ]; then
   cat >"$_DATA/.gitignore" <<-EOF
        users.db
        serverkey
+       tags/
+       index/
        **/#cache/
-       **/#page.lock
+       **/#page.md.lock
        **/#page.*.cache
        **/#page.*.cache.*
        **/#page:*.*.cache
        **/#page:*.*.cache.*
+       **/#index.flag
        EOF
   [ "$REV_ATTACHMENTS" != true ] \
   && printf '**/#attachments/\n' >>"$_DATA/.gitignore"