diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-07-14 15:08:28 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-07-14 15:08:28 +0000 |
commit | de723aed60a6a16aa8c8354b99ef7539a153fef7 (patch) | |
tree | 404735d2078f63d884f31b9164338b5f8bbf6d72 | |
parent | 3c93c3a82929d7c8bc6ec5a03461367fcadb7e99 (diff) | |
parent | 780603dc81931c5be5e795bb29a5e8092a944fa8 (diff) | |
download | lorry-controller-de723aed60a6a16aa8c8354b99ef7539a153fef7.tar.gz |
Merge branch 'baserock/pedroalvarez/trove-ansible3'
Reviewed-by: Richard Maw
Reviewed-by: Lars Wirzenius
-rw-r--r-- | lorry-controller.morph | 4 | ||||
-rw-r--r-- | units/lighttpd-lorry-controller-webapp.service | 3 | ||||
-rw-r--r-- | units/lorry-controller-ls-troves.service | 3 | ||||
-rw-r--r-- | units/lorry-controller-ls-troves.timer | 4 | ||||
-rw-r--r-- | units/lorry-controller-minion@.service | 3 | ||||
-rw-r--r-- | units/lorry-controller-readconf.service | 3 | ||||
-rw-r--r-- | units/lorry-controller-readconf.timer | 4 | ||||
-rw-r--r-- | units/lorry-controller-status.service | 3 | ||||
-rw-r--r-- | units/lorry-controller-status.timer | 4 |
9 files changed, 24 insertions, 7 deletions
diff --git a/lorry-controller.morph b/lorry-controller.morph index 9f1623a..a16f9d9 100644 --- a/lorry-controller.morph +++ b/lorry-controller.morph @@ -8,7 +8,3 @@ post-install-commands: TGT="$DESTDIR/usr/lib/systemd/system" install -d "$TGT/multi-user.target.wants" install -m 0644 units/*.service units/*.timer "$TGT/." - cd "$TGT/multi-user.target.wants" - # Ignore template units for symlinking. The template units will be - # instantiated at deploy time by trove.configure. - ln -s ../*[^@].service ../*[^@].timer . diff --git a/units/lighttpd-lorry-controller-webapp.service b/units/lighttpd-lorry-controller-webapp.service index 0c04fac..9586c43 100644 --- a/units/lighttpd-lorry-controller-webapp.service +++ b/units/lighttpd-lorry-controller-webapp.service @@ -1,3 +1,6 @@ +[Install] +WantedBy=multi-user.target + [Unit] Description=Lighttpd Web Server for Lorry Controller WEBAPP After=network.target diff --git a/units/lorry-controller-ls-troves.service b/units/lorry-controller-ls-troves.service index fe97811..f7db2e7 100644 --- a/units/lorry-controller-ls-troves.service +++ b/units/lorry-controller-ls-troves.service @@ -1,3 +1,6 @@ +[Install] +WantedBy=multi-user.target + [Unit] Description=Lorry Controller ls-troves After=lighttpd-lorry-controller-webapp.service diff --git a/units/lorry-controller-ls-troves.timer b/units/lorry-controller-ls-troves.timer index dbd157d..c5e5ae3 100644 --- a/units/lorry-controller-ls-troves.timer +++ b/units/lorry-controller-ls-troves.timer @@ -1,6 +1,8 @@ +[Install] +WantedBy=multi-user.target + [Unit] Description=Lorry Controller ls-troves -After=lighttpd-lorry-controller-webapp.service [Timer] OnUnitInactiveSec=60 diff --git a/units/lorry-controller-minion@.service b/units/lorry-controller-minion@.service index b63d996..592ac7c 100644 --- a/units/lorry-controller-minion@.service +++ b/units/lorry-controller-minion@.service @@ -1,3 +1,6 @@ +[Install] +WantedBy=multi-user.target + [Unit] Description=Lorry Controller MINION %i After=lighttpd-lorry-controller-webapp.service diff --git a/units/lorry-controller-readconf.service b/units/lorry-controller-readconf.service index 1f73b46..c13bc68 100644 --- a/units/lorry-controller-readconf.service +++ b/units/lorry-controller-readconf.service @@ -1,3 +1,6 @@ +[Install] +WantedBy=multi-user.target + [Unit] Description=Lorry Controller read config at startup After=lighttpd-lorry-controller-webapp.service diff --git a/units/lorry-controller-readconf.timer b/units/lorry-controller-readconf.timer index 7e4f04e..16dfd80 100644 --- a/units/lorry-controller-readconf.timer +++ b/units/lorry-controller-readconf.timer @@ -1,6 +1,8 @@ +[Install] +WantedBy=multi-user.target + [Unit] Description=Lorry Controller read config at startup -After=lighttpd-lorry-controller-webapp.service [Timer] OnUnitInactiveSec=60 diff --git a/units/lorry-controller-status.service b/units/lorry-controller-status.service index 381677b..ce1990a 100644 --- a/units/lorry-controller-status.service +++ b/units/lorry-controller-status.service @@ -1,3 +1,6 @@ +[Install] +WantedBy=multi-user.target + [Unit] Description=Lorry Controller Status update After=lighttpd-lorry-controller-webapp.service diff --git a/units/lorry-controller-status.timer b/units/lorry-controller-status.timer index 1528b8c..6bc2ceb 100644 --- a/units/lorry-controller-status.timer +++ b/units/lorry-controller-status.timer @@ -1,6 +1,8 @@ +[Install] +WantedBy=multi-user.target + [Unit] Description=Lorry Controller Status update -After=lighttpd-lorry-controller-webapp.service [Timer] OnUnitInactiveSec=60 |