diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-06 15:41:52 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-06 15:41:52 +0000 |
| commit | 8072351c428ce0508868f5733aaad36be13e2b26 (patch) | |
| tree | a82b392525c1b78499a408a22c2a1969b1599c6d | |
| parent | 177c7efb7a048b0161c34fa5255d0f82af300680 (diff) | |
| parent | 9197e12d776d950ee3e5e15a2a7e7b905afdb632 (diff) | |
| download | trove-setup-8072351c428ce0508868f5733aaad36be13e2b26.tar.gz | |
Merge branch 'baserock/sam/trove-public-urls'
Reviewed-By: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
| -rw-r--r-- | etc/cgitrc | 2 | ||||
| -rw-r--r-- | etc/trove-setup.sed.example | 18 |
2 files changed, 10 insertions, 10 deletions
@@ -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 |