From f87974a75ce13167d267750a79f907cd34fa5bdc Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 24 Jun 2014 10:59:43 +0000 Subject: Do not enable the services and timers trove-setup will enable them on the first boot. --- lorry-controller.morph | 4 ---- 1 file changed, 4 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 . -- cgit v1.2.1 From f69fc3d19baccd2517faf3cdcf09f3866d7a151a Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 9 Jul 2014 08:44:33 +0000 Subject: Add 'Install' information to the units --- units/lighttpd-lorry-controller-webapp.service | 3 +++ units/lorry-controller-ls-troves.service | 3 +++ units/lorry-controller-ls-troves.timer | 3 +++ units/lorry-controller-minion@.service | 3 +++ units/lorry-controller-readconf.service | 3 +++ units/lorry-controller-readconf.timer | 3 +++ units/lorry-controller-status.service | 3 +++ units/lorry-controller-status.timer | 3 +++ 8 files changed, 24 insertions(+) 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..609150a 100644 --- a/units/lorry-controller-ls-troves.timer +++ b/units/lorry-controller-ls-troves.timer @@ -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-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..e538a23 100644 --- a/units/lorry-controller-readconf.timer +++ b/units/lorry-controller-readconf.timer @@ -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-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..499e81b 100644 --- a/units/lorry-controller-status.timer +++ b/units/lorry-controller-status.timer @@ -1,3 +1,6 @@ +[Install] +WantedBy=multi-user.target + [Unit] Description=Lorry Controller Status update After=lighttpd-lorry-controller-webapp.service -- cgit v1.2.1 From 780603dc81931c5be5e795bb29a5e8092a944fa8 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 11 Jul 2014 12:47:45 +0000 Subject: Remove dependency of lighttpd-lorry-controller-webapp --- units/lorry-controller-ls-troves.timer | 1 - units/lorry-controller-readconf.timer | 1 - units/lorry-controller-status.timer | 1 - 3 files changed, 3 deletions(-) diff --git a/units/lorry-controller-ls-troves.timer b/units/lorry-controller-ls-troves.timer index 609150a..c5e5ae3 100644 --- a/units/lorry-controller-ls-troves.timer +++ b/units/lorry-controller-ls-troves.timer @@ -3,7 +3,6 @@ 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-readconf.timer b/units/lorry-controller-readconf.timer index e538a23..16dfd80 100644 --- a/units/lorry-controller-readconf.timer +++ b/units/lorry-controller-readconf.timer @@ -3,7 +3,6 @@ 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.timer b/units/lorry-controller-status.timer index 499e81b..6bc2ceb 100644 --- a/units/lorry-controller-status.timer +++ b/units/lorry-controller-status.timer @@ -3,7 +3,6 @@ WantedBy=multi-user.target [Unit] Description=Lorry Controller Status update -After=lighttpd-lorry-controller-webapp.service [Timer] OnUnitInactiveSec=60 -- cgit v1.2.1