Make building locally work again

[mirror/dsa-wiki.git] / bin / update-wiki

diff --git a/bin/update-wiki b/bin/update-wiki
index 3be2046..6847b0e 100755 (executable)
--- a/bin/update-wiki
+++ b/bin/update-wiki
@@ -3,8 +3,8 @@
 set -e
 umask 0002
 
-WC="/org/dsa.debian.org/dsa-wiki"
-DEST="/org/dsa.debian.org/htdocs"
+WC="/srv/dsa.debian.org/dsa-wiki"
+DEST="/srv/dsa.debian.org/htdocs"
 URL="http://dsa.debian.org/"
 UPDATE=1
 
@@ -12,6 +12,12 @@ UPDATE=1
 
 [ "$UPDATE" != 1 ] || ( cd "$WC" && env -i git pull )
 
+if [ "$UPDATE" != 1 ]; then
+       GITPLUGIN=""
+else
+       GITPLUGIN="--plugin git"
+fi
+
 env -i ikiwiki \
        --timeformat '%F' \
        --wikiname 'DSA' \
@@ -20,15 +26,16 @@ env -i ikiwiki \
        --underlaydir "$WC/underlay" \
        --templatedir "$WC/templates" \
        --no-discussion \
-       --rebuild \
-        --atom \
-        --rss \
+       --refresh \
+       --atom \
+       --rss \
        --plugin template \
        --plugin toggle \
        --plugin inline \
        --plugin sidebar \
        --plugin table \
        --plugin creole \
+       $GITPLUGIN \
        --disable-plugin openid \
        --disable-plugin sandbox \
        --disable-plugin passwordauth \