diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-12 11:43:17 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-12 11:43:17 +0000 |
| commit | 5b689301a2a13dd549ed86d236ff26db6e1fae82 (patch) | |
| tree | e8e327e62cd7376f8c3d199943bbf132c5c95bb8 /bins/trove-early-setup | |
| parent | 6a627e6da9b1384d3c49be6134e4a71aa4c284db (diff) | |
| parent | 843f37ead2edafdd6fa0ec7cf268441c540689b6 (diff) | |
| download | trove-setup-5b689301a2a13dd549ed86d236ff26db6e1fae82.tar.gz | |
Merge branch 'baserock/sam/trove-configure'
Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk>
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Lars Wirzenius <richard.maw@codethink.co.uk>
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 |