projects
/
mirror
/
dsa-wiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct path to local.yaml within the puppet repository
[mirror/dsa-wiki.git]
/
bin
/
update-wiki
diff --git
a/bin/update-wiki
b/bin/update-wiki
index
98b0b5a
..
cfdc09a
100755
(executable)
--- 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"
WC="/srv/dsa.debian.org/dsa-wiki"
DEST="/srv/dsa.debian.org/htdocs"
-URL="http://dsa.debian.org/"
+URL="http
s
://dsa.debian.org/"
UPDATE=1
! [ -e "$HOME/.dsa-wiki-local" ] || . "$HOME/.dsa-wiki-local"
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=""
if [ "$UPDATE" != 1 ]; then
GITPLUGIN=""
@@
-27,7
+27,6
@@
env -i "HOME=$HOME" \
--underlaydir "$WC/underlay" \
--templatedir "$WC/templates" \
--no-discussion \
--underlaydir "$WC/underlay" \
--templatedir "$WC/templates" \
--no-discussion \
- --refresh \
--atom \
--rss \
--plugin template \
--atom \
--rss \
--plugin template \
@@
-35,10
+34,13
@@
env -i "HOME=$HOME" \
--plugin inline \
--plugin sidebar \
--plugin table \
--plugin inline \
--plugin sidebar \
--plugin table \
+ --plugin mdwn \
--plugin creole \
$GITPLUGIN \
--disable-plugin openid \
--disable-plugin sandbox \
--disable-plugin passwordauth \
--plugin creole \
$GITPLUGIN \
--disable-plugin openid \
--disable-plugin sandbox \
--disable-plugin passwordauth \
+ --set multimarkdown=1 \
+ --refresh \
"$WC/input" \
"$DEST"
"$WC/input" \
"$DEST"