From 843f37ead2edafdd6fa0ec7cf268441c540689b6 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 11 Mar 2014 12:58:21 +0000 Subject: 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. --- bins/trove-early-setup | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'bins/trove-early-setup') 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 -- cgit v1.2.1