From 4041c6d69bcb4b5c8e6ad41fe0f69cc9325fd377 Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Wed, 18 Jun 2014 14:55:48 +0100
Subject: Rename TROVE_HOSTNAME to TROVE_FQDN

---
 etc/cgitrc                                 | 2 +-
 gitano-admin/global-hooks/post-receive.lua | 4 ++--
 gitano-admin/users/distbuild/user.conf     | 2 +-
 gitano-admin/users/lorry/user.conf         | 2 +-
 gitano-admin/users/mason/user.conf         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/cgitrc b/etc/cgitrc
index c526e17..99a5f9a 100644
--- a/etc/cgitrc
+++ b/etc/cgitrc
@@ -1,4 +1,4 @@
-clone-prefix=git://##TROVE_HOSTNAME## http://##TROVE_HOSTNAME##/git https://##TROVE_HOSTNAME##/git ssh://git@##TROVE_HOSTNAME##
+clone-prefix=git://##TROVE_FQDN## http://##TROVE_FQDN##/git https://##TROVE_HOSTNAME##/git ssh://git@##TROVE_HOSTNAME##
 strict-export=git-daemon-export-ok
 
 css=/cgit/cgit.css
diff --git a/gitano-admin/global-hooks/post-receive.lua b/gitano-admin/global-hooks/post-receive.lua
index d1b3864..6c6abbd 100644
--- a/gitano-admin/global-hooks/post-receive.lua
+++ b/gitano-admin/global-hooks/post-receive.lua
@@ -17,8 +17,8 @@ local EMPTY_SHA = ("0"):rep(40)
 local masonhost = "##MASON_HOST##:##MASON_PORT##"
 local basepath = "/1.0"
 local urlbases = {
-   "git://##TROVE_HOSTNAME##/",
-   "ssh://git@##TROVE_HOSTNAME##/",
+   "git://##TROVE_FQDN##/",
+   "ssh://git@##TROVE_FQDN##/",
 }
 
 local notify_mason = false
diff --git a/gitano-admin/users/distbuild/user.conf b/gitano-admin/users/distbuild/user.conf
index 62ac3f5..2089f90 100644
--- a/gitano-admin/users/distbuild/user.conf
+++ b/gitano-admin/users/distbuild/user.conf
@@ -1,2 +1,2 @@
-email_address "distbuild@##TROVE_HOSTNAME##"
+email_address "distbuild@##TROVE_FQDN##"
 real_name "Baserock Distributed Build Service"
diff --git a/gitano-admin/users/lorry/user.conf b/gitano-admin/users/lorry/user.conf
index f21fac7..2470bd2 100644
--- a/gitano-admin/users/lorry/user.conf
+++ b/gitano-admin/users/lorry/user.conf
@@ -1,2 +1,2 @@
-email_address "lorry@##TROVE_HOSTNAME##"
+email_address "lorry@##TROVE_FQDN##"
 real_name "Source Code Lorry Service"
diff --git a/gitano-admin/users/mason/user.conf b/gitano-admin/users/mason/user.conf
index 639de4e..b6467e5 100644
--- a/gitano-admin/users/mason/user.conf
+++ b/gitano-admin/users/mason/user.conf
@@ -1,2 +1,2 @@
-email_address "mason@##TROVE_HOSTNAME##"
+email_address "mason@##TROVE_FQDN##"
 real_name "Baserock Continuous Integration Service"
-- 
cgit v1.2.1