summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-03-11 12:58:21 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-03-11 13:03:14 +0000
commit843f37ead2edafdd6fa0ec7cf268441c540689b6 (patch)
tree95ae3de8f5e74313858f20bffbbebaec8a2826b2
parent8072351c428ce0508868f5733aaad36be13e2b26 (diff)
downloadtrove-setup-843f37ead2edafdd6fa0ec7cf268441c540689b6.tar.gz
trove-setup: Do subsitutions in /etc at deploy-time, not at first boot
We do not support deploying Trove in any way other than using `morph deploy`. The trove-setup.sed.example file is a remnant of the days before `morph deploy` existed. The 'hostname-not-baserock' test has been removed.
-rwxr-xr-xbins/trove-early-setup20
-rw-r--r--etc/trove-setup.sed.example38
2 files changed, 1 insertions, 57 deletions
diff --git a/bins/trove-early-setup b/bins/trove-early-setup
index eea068d..308a3e7 100755
--- a/bins/trove-early-setup
+++ b/bins/trove-early-setup
@@ -18,28 +18,10 @@
# -*- Make -*-
-all: substitutions-done gitano-configured lorry-configured cache-configured mason-configured nfs-configured cert-generated
+all: gitano-configured lorry-configured cache-configured mason-configured nfs-configured cert-generated
USERS := git lorry cache mason
-.PHONY: substitutions-done
-substitutions-done: /etc/trove-setup.sed hostname-not-baserock
- sed -f /etc/trove-setup.sed -i \
- /usr/share/gitano/skel/gitano-admin/*/*.lace \
- /usr/share/gitano/skel/gitano-admin/*/*.lua \
- /usr/share/gitano/skel/gitano-admin/users/*/user.conf \
- /etc/cgitrc /etc/gitano-setup.clod /etc/lorry.conf
-
-/etc/trove-setup.sed:
- @echo "You need to create $@ to continue."
- @echo "There is $@.example which you can work from."
- @echo "re-run trove-early-setup once you're done with this."
- @exit 1
-
-.PHONY: hostname-not-baserock
-hostname-not-baserock:
- test "x$$(hostname)" != "baserock"
-
# $1 == username to make
define make_user_rules
diff --git a/etc/trove-setup.sed.example b/etc/trove-setup.sed.example
deleted file mode 100644
index 7d10ec2..0000000
--- a/etc/trove-setup.sed.example
+++ /dev/null
@@ -1,38 +0,0 @@
-# Sed rules for configuring trove.
-
-# Hostnames
-
-## This is the hostname for the Trove instance itself
-s/##TROVE_HOSTNAME##/trove-host/g
-
-## This is the hostname for the Mason which Trove is linking to
-s/##MASON_HOST##/mason-host/g
-
-# Ports in use
-
-## This is the port for Mason. Normally it'll be 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/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/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/g
-
-## The prefix used for branches and repositories for this Trove
-s/##PREFIX##/trove-prefix/g
-## The same prefix as above, only lua-pattern-escaped
-s/##ESC_PREFIX##/trove%-prefix/g
-