From 65e9bbd177c49a7e0f102574d7731a13599a0d91 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 17 Jun 2014 13:18:55 +0000
Subject: Move template files from /etc to shares/trove-setup/etc

---
 etc/cgitrc                  | 26 --------------------------
 etc/gitano-setup.clod       | 18 ------------------
 etc/lorry.conf              | 11 -----------
 share/etc/cgitrc            | 26 ++++++++++++++++++++++++++
 share/etc/gitano-setup.clod | 18 ++++++++++++++++++
 share/etc/lorry.conf        | 11 +++++++++++
 6 files changed, 55 insertions(+), 55 deletions(-)
 delete mode 100644 etc/cgitrc
 delete mode 100644 etc/gitano-setup.clod
 delete mode 100644 etc/lorry.conf
 create mode 100644 share/etc/cgitrc
 create mode 100644 share/etc/gitano-setup.clod
 create mode 100644 share/etc/lorry.conf

diff --git a/etc/cgitrc b/etc/cgitrc
deleted file mode 100644
index c526e17..0000000
--- a/etc/cgitrc
+++ /dev/null
@@ -1,26 +0,0 @@
-clone-prefix=git://##TROVE_HOSTNAME## http://##TROVE_HOSTNAME##/git https://##TROVE_HOSTNAME##/git ssh://git@##TROVE_HOSTNAME##
-strict-export=git-daemon-export-ok
-
-css=/cgit/cgit.css
-logo=/trove.png
-
-head-include=/etc/cgit-trove-head.inc
-footer=/etc/cgit-trove-footer.inc
-
-enable-index-links=1
-root-title=##TROVE_TITLE## Git Repositories
-root-desc=Baserock Trove -- For ##TROVE_COMPANY##
-snapshots=tar.gz
-enable-commit-graph=1
-enable-log-filecount=1
-enable-log-linecount=1
-
-mimetype.gif=image/gif
-mimetype.html=text/html
-mimetype.jpg=image/jpeg
-mimetype.jpeg=image/jpeg
-mimetype.pdf=application/pdf
-mimetype.png=image/png
-mimetype.svg=image/svg+xml
-
-scan-path=/home/git/repos/
diff --git a/etc/gitano-setup.clod b/etc/gitano-setup.clod
deleted file mode 100644
index b63aeb6..0000000
--- a/etc/gitano-setup.clod
+++ /dev/null
@@ -1,18 +0,0 @@
--- Configuration for gitano-setup
-
-paths.home "/home/git"
-paths.ssh "/home/git/.ssh"
-paths.pubkey "/home/git/.ssh/id_rsa.pub"
-paths.repos "/home/git/repos"
-
-admin.username "trove"
-admin.realname "Trove Instance Administrator"
-admin.email "trove@trove-instance"
-admin.keyname "trove"
-
-site.name "##TROVE_TITLE## for ##TROVE_COMPANY##"
-log.prefix "##TROVE_LOG_PREFIX##"
-
-use.htpasswd "yes"
-
-setup.batch = true
diff --git a/etc/lorry.conf b/etc/lorry.conf
deleted file mode 100644
index 16552cb..0000000
--- a/etc/lorry.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[config]
-mirror-base-url-push = ssh://git@localhost
-mirror-base-url-fetch = git://##TROVE_HOSTNAME##
-bundle = never
-bundle-dest = /home/lorry/bundles
-tarball = always
-tarball-dest = /home/lorry/tarballs
-working-area = /home/lorry/working-area
-verbose = yes
-log = /dev/stdout
-log-level = debug
diff --git a/share/etc/cgitrc b/share/etc/cgitrc
new file mode 100644
index 0000000..c526e17
--- /dev/null
+++ b/share/etc/cgitrc
@@ -0,0 +1,26 @@
+clone-prefix=git://##TROVE_HOSTNAME## http://##TROVE_HOSTNAME##/git https://##TROVE_HOSTNAME##/git ssh://git@##TROVE_HOSTNAME##
+strict-export=git-daemon-export-ok
+
+css=/cgit/cgit.css
+logo=/trove.png
+
+head-include=/etc/cgit-trove-head.inc
+footer=/etc/cgit-trove-footer.inc
+
+enable-index-links=1
+root-title=##TROVE_TITLE## Git Repositories
+root-desc=Baserock Trove -- For ##TROVE_COMPANY##
+snapshots=tar.gz
+enable-commit-graph=1
+enable-log-filecount=1
+enable-log-linecount=1
+
+mimetype.gif=image/gif
+mimetype.html=text/html
+mimetype.jpg=image/jpeg
+mimetype.jpeg=image/jpeg
+mimetype.pdf=application/pdf
+mimetype.png=image/png
+mimetype.svg=image/svg+xml
+
+scan-path=/home/git/repos/
diff --git a/share/etc/gitano-setup.clod b/share/etc/gitano-setup.clod
new file mode 100644
index 0000000..b63aeb6
--- /dev/null
+++ b/share/etc/gitano-setup.clod
@@ -0,0 +1,18 @@
+-- Configuration for gitano-setup
+
+paths.home "/home/git"
+paths.ssh "/home/git/.ssh"
+paths.pubkey "/home/git/.ssh/id_rsa.pub"
+paths.repos "/home/git/repos"
+
+admin.username "trove"
+admin.realname "Trove Instance Administrator"
+admin.email "trove@trove-instance"
+admin.keyname "trove"
+
+site.name "##TROVE_TITLE## for ##TROVE_COMPANY##"
+log.prefix "##TROVE_LOG_PREFIX##"
+
+use.htpasswd "yes"
+
+setup.batch = true
diff --git a/share/etc/lorry.conf b/share/etc/lorry.conf
new file mode 100644
index 0000000..16552cb
--- /dev/null
+++ b/share/etc/lorry.conf
@@ -0,0 +1,11 @@
+[config]
+mirror-base-url-push = ssh://git@localhost
+mirror-base-url-fetch = git://##TROVE_HOSTNAME##
+bundle = never
+bundle-dest = /home/lorry/bundles
+tarball = always
+tarball-dest = /home/lorry/tarballs
+working-area = /home/lorry/working-area
+verbose = yes
+log = /dev/stdout
+log-level = debug
-- 
cgit v1.2.1