summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2019-05-15 15:20:49 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2019-05-23 16:07:56 +0200
commitefabde7b7be19fbd35c886ad3dfd3431a24c5478 (patch)
tree025580160f2e2f9e32bc1ab87cbfcce5fc1759c4 /conf
parent401188a731f39ce464db3a31d810be962bf21e1d (diff)
afm-unit conf: Remove useless tests
The tests were not needed because they were in the body of a conditional part ruled by the same test. Bug-AGL: SPEC-2436 Change-Id: Ia5cd1157dde6fc2b5aa1153aa375568b39639caf Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'conf')
-rw-r--r--conf/unit/afm-unit-debug.conf.in4
-rw-r--r--conf/unit/afm-unit.conf.in4
-rw-r--r--conf/unit/generate-unit-conf/provided-api.inc5
3 files changed, 0 insertions, 13 deletions
diff --git a/conf/unit/afm-unit-debug.conf.in b/conf/unit/afm-unit-debug.conf.in
index 8221105..2ef20e7 100644
--- a/conf/unit/afm-unit-debug.conf.in
+++ b/conf/unit/afm-unit-debug.conf.in
@@ -233,16 +233,12 @@ Description=Provides api {{name}} for user %i
X-AFM-API-TYPE={{value}}
Requires=afm-user-setup@%i.service
After=afm-user-setup@%i.service
-{{#value=ws|auto}}
Requires=afm-api-{{name}}@%i.socket
After=afm-api-{{name}}@%i.socket
-{{/value=ws|auto}}
[Service]
Type=oneshot
RemainAfterExit=yes
-{{#value=ws|auto}}
ExecStart=/bin/true
-{{/value=ws|auto}}
%end systemd-unit
;-------------------------------------------------------------------------------
;---- T H E S O C K E T O F T H E A P I ----
diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in
index f8e4409..02dd82d 100644
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -234,16 +234,12 @@ Description=Provides api {{name}} for user %i
X-AFM-API-TYPE={{value}}
Requires=afm-user-setup@%i.service
After=afm-user-setup@%i.service
-{{#value=ws|auto}}
Requires=afm-api-{{name}}@%i.socket
After=afm-api-{{name}}@%i.socket
-{{/value=ws|auto}}
[Service]
Type=oneshot
RemainAfterExit=yes
-{{#value=ws|auto}}
ExecStart=/bin/true
-{{/value=ws|auto}}
%end systemd-unit
;-------------------------------------------------------------------------------
;---- T H E S O C K E T O F T H E A P I ----
diff --git a/conf/unit/generate-unit-conf/provided-api.inc b/conf/unit/generate-unit-conf/provided-api.inc
index db5f125..ddf7c51 100644
--- a/conf/unit/generate-unit-conf/provided-api.inc
+++ b/conf/unit/generate-unit-conf/provided-api.inc
@@ -23,21 +23,16 @@ X-AFM-API-TYPE={{value}}
Requires=afm-user-setup@%i.service
After=afm-user-setup@%i.service
-{{#value=ws|auto}}
Requires=UNIT_NAME_API_BASE({{name}})@%i.socket
After=UNIT_NAME_API_BASE({{name}})@%i.socket
-{{/value=ws|auto}}
[Service]
Type=oneshot
RemainAfterExit=yes
-{{#value=ws|auto}}
ExecStart=/bin/true
-{{/value=ws|auto}}
%end systemd-unit
-
;-------------------------------------------------------------------------------
;---- T H E S O C K E T O F T H E A P I ----
;-------------------------------------------------------------------------------