From: Lisa Marie Maginnis <lisam@fsf.org>
Date: Wed, 28 Jan 2015 22:32:37 +0000 (-0500)
Subject: movewiki fixes
X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=commitdiff_plain;h=82d3b7c28b20d7bda7169ff447be7c5df01090c9;hp=7afb115819bb5120838b7ac000bd354554f495bf;ds=sidebyside

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 b959b6c..bfd5387 100755
--- 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 3a02ac8..914b829 100755
--- 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
+