aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2017-11-23 22:52:46 +0100
committerJosé Bollo <jose.bollo@iot.bzh>2017-11-24 17:44:58 +0100
commit37888ab2c20b493a2c4b5d21c498509cfdf7ac7b (patch)
tree0856bda9d765d4130d9b4cd21caa5387d93bac33
parent5d36137251cb9325050ba56023ecd70743e132fd (diff)
Avoid implicit Before socket.target
Change-Id: I493c49a80ebb1fa85f586d0b0704b5682f0c3613 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
-rw-r--r--conf/unit/afm-unit-debug.conf.in7
-rw-r--r--conf/unit/afm-unit.conf.in7
-rw-r--r--conf/unit/generate-unit-conf/provided.inc1
-rw-r--r--conf/unit/generate-unit-conf/service.inc7
4 files changed, 22 insertions, 0 deletions
diff --git a/conf/unit/afm-unit-debug.conf.in b/conf/unit/afm-unit-debug.conf.in
index fdea673..d7fa47d 100644
--- a/conf/unit/afm-unit-debug.conf.in
+++ b/conf/unit/afm-unit-debug.conf.in
@@ -118,6 +118,12 @@ BindsTo=afm-api-ws-{{name}}@%i.socket
After=afm-api-ws-{{name}}@%i.socket
{{/value=auto|ws}}
{{/required-api}}
+{{#provided-api}}
+{{#value=ws|auto}}
+Requires=afm-api-ws-{{name}}@%i.socket
+After=afm-api-ws-{{name}}@%i.socket
+{{/value=ws|auto}}
+{{/provided-api}}
%nl
[Service]
EnvironmentFile=-@afm_confdir@/unit.env.d/*
@@ -208,6 +214,7 @@ WantedBy=afm-user-session@.target
Description=Provides api {{name}} for user %i
Requires=afm-user-setup@%i.service
After=afm-user-setup@%i.service
+DefaultDependencies=no
[Socket]
SmackLabel=*
ListenStream=/run/user/%i/apis/ws/{{name}}
diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in
index 56a9075..bf9b32a 100644
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -118,6 +118,12 @@ BindsTo=afm-api-ws-{{name}}@%i.socket
After=afm-api-ws-{{name}}@%i.socket
{{/value=auto|ws}}
{{/required-api}}
+{{#provided-api}}
+{{#value=ws|auto}}
+Requires=afm-api-ws-{{name}}@%i.socket
+After=afm-api-ws-{{name}}@%i.socket
+{{/value=ws|auto}}
+{{/provided-api}}
%nl
[Service]
EnvironmentFile=-@afm_confdir@/unit.env.d/*
@@ -208,6 +214,7 @@ WantedBy=afm-user-session@.target
Description=Provides api {{name}} for user %i
Requires=afm-user-setup@%i.service
After=afm-user-setup@%i.service
+DefaultDependencies=no
[Socket]
SmackLabel=*
ListenStream=/run/user/%i/apis/ws/{{name}}
diff --git a/conf/unit/generate-unit-conf/provided.inc b/conf/unit/generate-unit-conf/provided.inc
index fd5d3ec..4f96426 100644
--- a/conf/unit/generate-unit-conf/provided.inc
+++ b/conf/unit/generate-unit-conf/provided.inc
@@ -16,6 +16,7 @@ dnl vim: set filetype=sysctl.conf.m4 syntax=sysctl.conf.m4:
Description=Provides api {{name}} for user %i
Requires=afm-user-setup@%i.service
After=afm-user-setup@%i.service
+DefaultDependencies=no
[Socket]
SmackLabel=*
diff --git a/conf/unit/generate-unit-conf/service.inc b/conf/unit/generate-unit-conf/service.inc
index 273db3b..2ff1de7 100644
--- a/conf/unit/generate-unit-conf/service.inc
+++ b/conf/unit/generate-unit-conf/service.inc
@@ -47,6 +47,13 @@ BindsTo=UNIT_NAME_SOCKET_FOR({{name}})
After=UNIT_NAME_SOCKET_FOR({{name}})
{{/value=auto|ws}}
{{/required-api}}
+{{#provided-api}}
+{{#value=ws|auto}}
+Requires=UNIT_NAME_SOCKET_FOR({{name}})
+After=UNIT_NAME_SOCKET_FOR({{name}})
+{{/value=ws|auto}}
+{{/provided-api}}
+
%nl
[Service]