minor updates to upgrade proc

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

diff --git a/bin/update-wiki b/bin/update-wiki
index 3547c28..cfdc09a 100755 (executable)
--- a/bin/update-wiki
+++ b/bin/update-wiki
@@ -5,14 +5,21 @@ umask 0002
 
 WC="/srv/dsa.debian.org/dsa-wiki"
 DEST="/srv/dsa.debian.org/htdocs"
-URL="http://dsa.debian.org/"
+URL="https://dsa.debian.org/"
 UPDATE=1
 
 ! [ -e "$HOME/.dsa-wiki-local" ] || . "$HOME/.dsa-wiki-local"
 
-[ "$UPDATE" != 1 ] || ( cd "$WC" && env -i git pull )
+[ "$UPDATE" != 1 ] || ( cd "$WC" && env -i git pull --quiet )
 
-env -i ikiwiki \
+if [ "$UPDATE" != 1 ]; then
+       GITPLUGIN=""
+else
+       GITPLUGIN="--plugin git"
+fi
+
+env -i "HOME=$HOME" \
+    ikiwiki \
        --timeformat '%F' \
        --wikiname 'DSA' \
        --url "$URL" \
@@ -20,18 +27,20 @@ env -i ikiwiki \
        --underlaydir "$WC/underlay" \
        --templatedir "$WC/templates" \
        --no-discussion \
-       --refresh \
-        --atom \
-        --rss \
+       --atom \
+       --rss \
        --plugin template \
        --plugin toggle \
        --plugin inline \
        --plugin sidebar \
        --plugin table \
+       --plugin mdwn \
        --plugin creole \
-       --plugin git \
+       $GITPLUGIN \
        --disable-plugin openid \
        --disable-plugin sandbox \
        --disable-plugin passwordauth \
+       --set multimarkdown=1 \
+       --refresh \
        "$WC/input" \
        "$DEST"