X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=bin%2Fupdate-wiki;h=cfdc09ab980facf5eb051a4ac58d9be53d87c2e1;hb=13a8a8b8ebf87eeb625f5456a01b1a06ee8e73ac;hp=3be2046a348a2477d83e6693d2eb9c589443ebe1;hpb=ee4ec33d75ba7ab0e59614733673cc1d234fd11b;p=mirror%2Fdsa-wiki.git

diff --git a/bin/update-wiki b/bin/update-wiki
index 3be2046..cfdc09a 100755
--- a/bin/update-wiki
+++ b/bin/update-wiki
@@ -3,16 +3,23 @@
 set -e
 umask 0002
 
-WC="/org/dsa.debian.org/dsa-wiki"
-DEST="/org/dsa.debian.org/htdocs"
-URL="http://dsa.debian.org/"
+WC="/srv/dsa.debian.org/dsa-wiki"
+DEST="/srv/dsa.debian.org/htdocs"
+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,17 +27,20 @@ env -i ikiwiki \
 	--underlaydir "$WC/underlay" \
 	--templatedir "$WC/templates" \
 	--no-discussion \
-	--rebuild \
-        --atom \
-        --rss \
+	--atom \
+	--rss \
 	--plugin template \
 	--plugin toggle \
 	--plugin inline \
 	--plugin sidebar \
 	--plugin table \
+	--plugin mdwn \
 	--plugin creole \
+	$GITPLUGIN \
 	--disable-plugin openid \
 	--disable-plugin sandbox \
 	--disable-plugin passwordauth \
+	--set multimarkdown=1 \
+	--refresh \
 	"$WC/input" \
 	"$DEST"