movewiki fixes

diff --git a/files/srv/ikiwiki/wiki.git/config/DEFAULT b/files/srv/ikiwiki/wiki/config/DEFAULT
similarity index 100%
rename from files/srv/ikiwiki/wiki.git/config/DEFAULT
rename to files/srv/ikiwiki/wiki/config/DEFAULT

diff --git a/scripts/IKIWIKI/10-ikiwiki.sh b/scripts/IKIWIKI/10-ikiwiki.sh
index b959b6cc101cb341a0364db8e4add2c33a6aba88..bfd538754c246ae86c275fb1ec6d142901bb6aaa 100755 (executable)
--- a/scripts/IKIWIKI/10-ikiwiki.sh
+++ b/scripts/IKIWIKI/10-ikiwiki.sh
@@ -12,3 +12,6 @@ fi
 # Configure for remote use 
 fcopy /home/ikiwiki/.ssh/config
 
+# Configure git
+$ROOTCMD git config --global user.name "WebUI"
+$ROOMCMD git config --global user.email "ikiwiki@gluestick.office.fsf.org"

diff --git a/scripts/IKIWIKI/20-setup-ikiwiki.sh b/scripts/IKIWIKI/20-setup-ikiwiki.sh
index 3a02ac8b07ffa3807e9504278dd424133cabaec7..914b829e35ff54cd5fe02dbb28660750a2c209d5 100755 (executable)
--- a/scripts/IKIWIKI/20-setup-ikiwiki.sh
+++ b/scripts/IKIWIKI/20-setup-ikiwiki.sh
@@ -7,7 +7,8 @@ if ! $ROOTCMD test -e /etc/ikiwiki/ikiwiki.setup ; then
 
  # run setup
  $ROOTCMD sudo -u ikiwiki ikiwiki --setup /etc/ikiwiki/ikiwiki.setup
+ # Fix the local gitrepo
+  $ROOTCMD sudo -u ikiwiki ikiwiki git clone git@vcs.fsf.org:gluestick.git
 fi
 
-# Fix the local gitrepo
-fcopy /srv/ikiwiki/wiki.git/config
+