summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-03-12 10:56:22 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-03-12 10:56:22 +0000
commit6a627e6da9b1384d3c49be6134e4a71aa4c284db (patch)
tree96f142c1e71fd40a8bde46289b9fbad1c92cbcdc
parentec294df1fcdbfd604ad14f3c79b22fee5e440cb8 (diff)
parent8072351c428ce0508868f5733aaad36be13e2b26 (diff)
downloadtrove-setup-6a627e6da9b1384d3c49be6134e4a71aa4c284db.tar.gz
Merge branch adamcoldrick/access-troves-via-http
-rw-r--r--etc/cgitrc2
-rw-r--r--etc/trove-setup.sed.example18
2 files changed, 10 insertions, 10 deletions
diff --git a/etc/cgitrc b/etc/cgitrc
index 43a8627..c526e17 100644
--- a/etc/cgitrc
+++ b/etc/cgitrc
@@ -1,4 +1,4 @@
-clone-prefix=ssh://git@##TROVE_HOSTNAME##
+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
diff --git a/etc/trove-setup.sed.example b/etc/trove-setup.sed.example
index 28c61c4..7d10ec2 100644
--- a/etc/trove-setup.sed.example
+++ b/etc/trove-setup.sed.example
@@ -3,36 +3,36 @@
# Hostnames
## This is the hostname for the Trove instance itself
-s/##TROVE_HOSTNAME##/trove-host/
+s/##TROVE_HOSTNAME##/trove-host/g
## This is the hostname for the Mason which Trove is linking to
-s/##MASON_HOST##/mason-host/
+s/##MASON_HOST##/mason-host/g
# Ports in use
## This is the port for Mason. Normally it'll be 18755
-s/##MASON_PORT##/18755/
+s/##MASON_PORT##/18755/g
# Configuration for the CGit instance and Gitano setup
## The title for this trove. '##TROVE_TITLE## Git Repositories' in
## the CGit root page. Also '##TROVE_TITLE## for ##TROVE_COMPANY##' in
## the Gitano site description field
-s/##TROVE_TITLE##/FooCorp Embedded Projects/
-s/##TROVE_COMPANY##/FooCorp International Plc/
+s/##TROVE_TITLE##/FooCorp Embedded Projects/g
+s/##TROVE_COMPANY##/FooCorp International Plc/g
## The log prefix for the Gitano instance on this trove.
## This is shown as [##TROVE_LOG_PREFIX##] whenever Gitano needs to say
## something to the user. Commonly this will be short form of the
## title or company
-s/##TROVE_LOG_PREFIX##/foocorp-trove/
+s/##TROVE_LOG_PREFIX##/foocorp-trove/g
## The prefix used for personal repositories. Default is 'people'
## Note, since this is ESC_ it should be lua-pattern escaped.
-s/##ESC_PERSONAL_PREFIX##/people/
+s/##ESC_PERSONAL_PREFIX##/people/g
## The prefix used for branches and repositories for this Trove
-s/##PREFIX##/trove-prefix/
+s/##PREFIX##/trove-prefix/g
## The same prefix as above, only lua-pattern-escaped
-s/##ESC_PREFIX##/trove%-prefix/
+s/##ESC_PREFIX##/trove%-prefix/g