projects
/
mirror
/
dsa-wiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix multipath removal script
[mirror/dsa-wiki.git]
/
bin
/
update-wiki
diff --git
a/bin/update-wiki
b/bin/update-wiki
index
53dba57
..
cfdc09a
100755
(executable)
--- a/
bin/update-wiki
+++ b/
bin/update-wiki
@@
-3,24
+3,44
@@
set -e
umask 0002
set -e
umask 0002
-cd /srv/dsa.debian.org/dsa-wiki && env -i git pull
+WC="/srv/dsa.debian.org/dsa-wiki"
+DEST="/srv/dsa.debian.org/htdocs"
+URL="https://dsa.debian.org/"
+UPDATE=1
-env -i ikiwiki \
+! [ -e "$HOME/.dsa-wiki-local" ] || . "$HOME/.dsa-wiki-local"
+
+[ "$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' \
--timeformat '%F' \
--wikiname 'DSA' \
- --url "
http://dsa.debian.org/
" \
+ --url "
$URL
" \
--adminemail debian-admin@debian.org \
--adminemail debian-admin@debian.org \
- --underlaydir "
/org/dsa.debian.org/dsa-wiki
/underlay" \
- --templatedir "
/org/dsa.debian.org/dsa-wiki
/templates" \
+ --underlaydir "
$WC
/underlay" \
+ --templatedir "
$WC
/templates" \
--no-discussion \
--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 \
- "/org/dsa.debian.org/dsa-wiki/input" \
- "/org/dsa.debian.org/htdocs"
+ --set multimarkdown=1 \
+ --refresh \
+ "$WC/input" \
+ "$DEST"