From 82d3b7c28b20d7bda7169ff447be7c5df01090c9 Mon Sep 17 00:00:00 2001 From: Lisa Marie Maginnis Date: Wed, 28 Jan 2015 17:32:37 -0500 Subject: [PATCH] movewiki fixes --- files/srv/ikiwiki/{wiki.git => wiki}/config/DEFAULT | 0 scripts/IKIWIKI/10-ikiwiki.sh | 3 +++ scripts/IKIWIKI/20-setup-ikiwiki.sh | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) rename files/srv/ikiwiki/{wiki.git => wiki}/config/DEFAULT (100%) 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 + -- 2.25.1