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

diff --git a/bin/update-wiki b/bin/update-wiki
index feb93d8..98b0b5a 100755
--- 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,7 +12,14 @@ UPDATE=1
 
 [ "$UPDATE" != 1 ] || ( cd "$WC" && env -i git pull )
 
-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,12 +27,16 @@ env -i ikiwiki \
 	--underlaydir "$WC/underlay" \
 	--templatedir "$WC/templates" \
 	--no-discussion \
-	--rebuild \
+	--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 \