fixed scripts to copy more files

diff --git a/scripts/IKIWIKI/10-ikiwiki.sh b/scripts/IKIWIKI/10-ikiwiki.sh
index c7e596f90479052486867ac7256535c1dc6b91f0..b959b6cc101cb341a0364db8e4add2c33a6aba88 100755 (executable)
--- a/scripts/IKIWIKI/10-ikiwiki.sh
+++ b/scripts/IKIWIKI/10-ikiwiki.sh
@@ -9,4 +9,6 @@ if ! $ROOTCMD test -e /home/ikiwiki/.ssh/id_rsa; then
     $ROOTCMD echo | $ROOTCMD sudo -u ikiwiki ssh-keygen -N ''
 fi
 
     $ROOTCMD echo | $ROOTCMD sudo -u ikiwiki ssh-keygen -N ''
 fi
 

+# Configure for remote use 

 fcopy /home/ikiwiki/.ssh/config
 fcopy /home/ikiwiki/.ssh/config

+

diff --git a/scripts/IKIWIKI/20-setup-ikiwiki.sh b/scripts/IKIWIKI/20-setup-ikiwiki.sh
index 44659933aa52a5358bd9c01ed63237ec9c2c158d..36696b2de9d7fdf44426029bdb216ac43393a015 100755 (executable)
--- 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
 #!/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
  # 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
 fi

+
+# Fix the local gitrepo
+fcopy /srv/ikiwiki/wiki.git/config