X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=bin%2Fupdate-wiki;h=cfdc09ab980facf5eb051a4ac58d9be53d87c2e1;hb=99fc43a9bfe7b907feb2daf5c7eefc6baab3e7c9;hp=98b0b5a9be722f18b53160d0c3f6c651ac3b534e;hpb=fd505b434bd605fe63aca5f70c95f52cbc68c008;p=mirror%2Fdsa-wiki.git

diff --git a/bin/update-wiki b/bin/update-wiki
index 98b0b5a..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=""
@@ -27,7 +27,6 @@ env -i "HOME=$HOME" \
 	--underlaydir "$WC/underlay" \
 	--templatedir "$WC/templates" \
 	--no-discussion \
-	--refresh \
 	--atom \
 	--rss \
 	--plugin template \
@@ -35,10 +34,13 @@ env -i "HOME=$HOME" \
 	--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"