From efabde7b7be19fbd35c886ad3dfd3431a24c5478 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Wed, 15 May 2019 15:20:49 +0200 Subject: [PATCH] afm-unit conf: Remove useless tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- conf/unit/afm-unit-debug.conf.in | 4 ---- conf/unit/afm-unit.conf.in | 4 ---- conf/unit/generate-unit-conf/provided-api.inc | 5 ----- 3 files changed, 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 ---- ;------------------------------------------------------------------------------- -- 2.16.6