From da0ec3abd757898646003bac4b539928517c45f6 Mon Sep 17 00:00:00 2001 From: José Bollo Date: Thu, 20 Dec 2018 20:41:58 +0000 Subject: Revert "afm-unit: add autoapi in required-api feature" This reverts commit 2b6e13bd5812dc1d7efe338a163f6dd253bbe15b. Change-Id: I5e2493669da8d45150ed46257b06a5dae005e0bd --- conf/unit/afm-unit-debug.conf.in | 1 - conf/unit/afm-unit.conf.in | 1 - conf/unit/generate-unit-conf/binder.inc | 1 - 3 files changed, 3 deletions(-) diff --git a/conf/unit/afm-unit-debug.conf.in b/conf/unit/afm-unit-debug.conf.in index 7c74bc7..582e723 100644 --- a/conf/unit/afm-unit-debug.conf.in +++ b/conf/unit/afm-unit-debug.conf.in @@ -182,7 +182,6 @@ ExecStart=/usr/bin/afb-daemon \ {{#required-permission.urn:AGL:permission::public:applications:read}}--alias=/icons:{{:#metadata.icons-dir}}{{/required-permission.urn:AGL:permission::public:applications:read}} \ {{#required-api}} \ {{#value=auto|ws}}--ws-client=unix:@afm_users_rundir@/%i/apis/ws/{{name}}{{/value=auto|ws}} \ - {{#value=autoapi}}--auto-api=@afm_users_rundir@/%i/apis/ws{{/value=autoapi}} \ {{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \ {{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \ {{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \ diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in index 8497821..7c7d36a 100644 --- a/conf/unit/afm-unit.conf.in +++ b/conf/unit/afm-unit.conf.in @@ -183,7 +183,6 @@ ExecStart=/usr/bin/afb-daemon \ {{#required-permission.urn:AGL:permission::public:applications:read}}--alias=/icons:{{:#metadata.icons-dir}}{{/required-permission.urn:AGL:permission::public:applications:read}} \ {{#required-api}} \ {{#value=auto|ws}}--ws-client=unix:@afm_users_rundir@/%i/apis/ws/{{name}}{{/value=auto|ws}} \ - {{#value=autoapi}}--auto-api=@afm_users_rundir@/%i/apis/ws{{/value=autoapi}} \ {{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \ {{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \ {{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \ diff --git a/conf/unit/generate-unit-conf/binder.inc b/conf/unit/generate-unit-conf/binder.inc index bc4608d..1a5e71f 100644 --- a/conf/unit/generate-unit-conf/binder.inc +++ b/conf/unit/generate-unit-conf/binder.inc @@ -32,7 +32,6 @@ ENDIF \ ON_PERM(:public:applications:read, --alias=/icons:{{:#metadata.icons-dir}}) \ {{#required-api}} \ ON_VALUE(auto|ws, --ws-client=unix:API_PATH_WS/{{name}}) \ - ON_VALUE(autoapi, --api-auto=API_PATH_WS) \ ON_VALUE(dbus, --dbus-client={{name}}) \ ON_VALUE(cloud, --cloud-client={{name}}) \ ON_VALUE(local, --binding={{:#metadata.install-dir}}/{{name}}) \ -- cgit 1.2.3-korg