X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=bin%2Fupdate-wiki;h=cfdc09ab980facf5eb051a4ac58d9be53d87c2e1;hb=278701cec312c599a46b1f8f00eef65998323ba9;hp=6847b0eb86f1a4860fcd2ebb5d6b773bbfec055b;hpb=827ff06df4057eda3a6515f8ac23e6cf9ec630f9;p=mirror%2Fdsa-wiki.git

diff --git a/bin/update-wiki b/bin/update-wiki
index 6847b0e..cfdc09a 100755
--- a/bin/update-wiki
+++ b/bin/update-wiki
@@ -5,12 +5,12 @@ 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 )
 
 if [ "$UPDATE" != 1 ]; then
 	GITPLUGIN=""
@@ -18,7 +18,8 @@ else
 	GITPLUGIN="--plugin git"
 fi
 
-env -i ikiwiki \
+env -i "HOME=$HOME" \
+    ikiwiki \
 	--timeformat '%F' \
 	--wikiname 'DSA' \
 	--url "$URL" \
@@ -26,7 +27,6 @@ env -i ikiwiki \
 	--underlaydir "$WC/underlay" \
 	--templatedir "$WC/templates" \
 	--no-discussion \
-	--refresh \
 	--atom \
 	--rss \
 	--plugin template \
@@ -34,10 +34,13 @@ env -i ikiwiki \
 	--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"