projects
/
mirror
/
dsa-wiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tips: add puppet pre-commit hook setup instructions
[mirror/dsa-wiki.git]
/
bin
/
update-wiki
diff --git
a/bin/update-wiki
b/bin/update-wiki
index
f4578dd
..
ccf559c
100755
(executable)
--- a/
bin/update-wiki
+++ b/
bin/update-wiki
@@
-3,13
+3,23
@@
set -e
umask 0002
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=${UPDATE:-1}
-cd "$WC" && env -i git pull
+! [ -e "$HOME/.dsa-wiki-local" ] || . "$HOME/.dsa-wiki-local"
-env -i ikiwiki \
+[ "$UPDATE" != 1 ] || ( cd "$WC" && env -i git pull --quiet )
+
+if [ "$UPDATE" != 1 ]; then
+ GITPLUGIN=""
+else
+ GITPLUGIN="--plugin git"
+fi
+
+env -i "HOME=$HOME" \
+ ikiwiki \
--timeformat '%F' \
--wikiname 'DSA' \
--url "$URL" \
--timeformat '%F' \
--wikiname 'DSA' \
--url "$URL" \
@@
-17,14
+27,20
@@
env -i ikiwiki \
--underlaydir "$WC/underlay" \
--templatedir "$WC/templates" \
--no-discussion \
--underlaydir "$WC/underlay" \
--templatedir "$WC/templates" \
--no-discussion \
- --rebuild \
+ --atom \
+ --rss \
--plugin template \
--plugin toggle \
--plugin inline \
--plugin sidebar \
--plugin table \
--plugin template \
--plugin toggle \
--plugin inline \
--plugin sidebar \
--plugin table \
+ --plugin mdwn \
+ --plugin creole \
+ $GITPLUGIN \
--disable-plugin openid \
--disable-plugin sandbox \
--disable-plugin passwordauth \
--disable-plugin openid \
--disable-plugin sandbox \
--disable-plugin passwordauth \
+ --set multimarkdown=1 \
+ --refresh \
"$WC/input" \
"$DEST"
"$WC/input" \
"$DEST"