X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=blobdiff_plain;f=scripts%2FIKIWIKI%2F20-setup-ikiwiki.sh;h=3a02ac8b07ffa3807e9504278dd424133cabaec7;hp=44659933aa52a5358bd9c01ed63237ec9c2c158d;hb=cee2e23694b3b3e98c68049695da2cbdca2bbc9e;hpb=35c2205decf9a6894daea3bd1235d61c885bac4b;ds=sidebyside

diff --git a/scripts/IKIWIKI/20-setup-ikiwiki.sh b/scripts/IKIWIKI/20-setup-ikiwiki.sh
old mode 100644
new mode 100755
index 4465993..3a02ac8
--- a/scripts/IKIWIKI/20-setup-ikiwiki.sh
+++ b/scripts/IKIWIKI/20-setup-ikiwiki.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 
 # Detect if ikikwiki is already installed
-if [ ! -e /etc/ikiwiki/ikiwiki.setup ]; then
+if ! $ROOTCMD test -e /etc/ikiwiki/ikiwiki.setup ; then
  # copy ikiwiki config
  fcopy -v /etc/ikiwiki/ikiwiki.setup
 
  # run setup
- $ROOTCMD ikiwiki --setup /etc/ikiwiki/auto.setup/DEFAULT
+ $ROOTCMD sudo -u ikiwiki ikiwiki --setup /etc/ikiwiki/ikiwiki.setup
 fi
+
+# Fix the local gitrepo
+fcopy /srv/ikiwiki/wiki.git/config