summaryrefslogtreecommitdiff
path: root/trove.morph
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-03-11 12:56:40 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-03-11 16:45:47 +0000
commit92a399e428d7efb0666ac46037bad23bf07df16b (patch)
treec41c7662c1bcae5c5f61821197de0141cf7bcd00 /trove.morph
parentbe20e754434decec111a50401c97dd2140cbb693 (diff)
downloaddefinitions-92a399e428d7efb0666ac46037bad23bf07df16b.tar.gz
trove: Do subsitutions in /etc at deploy-time, not at first boot
This makes it easier to merge changes between /etc when doing upgrades. Lorry and Mason config goes into local-config.git, not in /etc, so this still needs to be done at first boot when we can run Gitano commands on the target. For this reason the /etc/trove-setup.sed file is still stored in the resulting system.
Diffstat (limited to 'trove.morph')
-rw-r--r--trove.morph3
1 files changed, 2 insertions, 1 deletions
diff --git a/trove.morph b/trove.morph
index 4c8ecd15..a259a339 100644
--- a/trove.morph
+++ b/trove.morph
@@ -150,7 +150,8 @@ chunks:
- hg-fast-export
- name: trove-setup
repo: baserock:baserock/trove-setup
- ref: master
+ ref: baserock/sam/trove-configure
+ unpetrify-ref: master
build-depends: []
- name: lorry-controller
repo: baserock:baserock/lorry-controller