diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-11 12:58:21 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-11 13:03:14 +0000 |
| commit | 843f37ead2edafdd6fa0ec7cf268441c540689b6 (patch) | |
| tree | 95ae3de8f5e74313858f20bffbbebaec8a2826b2 /bins/trove-early-setup | |
| parent | 8072351c428ce0508868f5733aaad36be13e2b26 (diff) | |
| download | trove-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.
Diffstat (limited to 'bins/trove-early-setup')
| -rwxr-xr-x | bins/trove-early-setup | 20 |
1 files changed, 1 insertions, 19 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 |