summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-02-25 15:33:31 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-02-26 15:13:12 +0000
commitcdece44ea08a8b1abc3b481cce31cffb40ca2628 (patch)
tree645b9d0a1587c9aa09b2132100e3e6e18f1c2eb9
parent73f9d2a937daa7a122fc4aa1325661689567e8ca (diff)
downloadmorphs-cdece44ea08a8b1abc3b481cce31cffb40ca2628.tar.gz
Ensure trove-early-setup.service runs before the Trove daemons
-rwxr-xr-xtrove.configure6
1 files changed, 6 insertions, 0 deletions
diff --git a/trove.configure b/trove.configure
index a28b11c..ce04a22 100755
--- a/trove.configure
+++ b/trove.configure
@@ -154,8 +154,14 @@ After=opensshd.service
# unit runs.
Requires=local-fs.target
After=local-fs.target
+
ConditionPathExists=/etc/trove-setup.needed
+# These must wait until we have created the required users on first boot.
+Before=lighttpd.service
+Before=git-daemon.service
+
+
[Service]
Type=oneshot
ExecStart=/bin/sh -c 'ssh-keyscan localhost $UPSTREAM_TROVE> /etc/ssh/ssh_known_hosts'