From 2b6e13bd5812dc1d7efe338a163f6dd253bbe15b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20B=C3=A9nier?= Date: Fri, 14 Dec 2018 03:55:29 +0100 Subject: [PATCH] afm-unit: add autoapi in required-api feature MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - required-api feature: add autoapi value - start the daemon with --auto-api option to the websocket directory Change-Id: Ia36d0edb4bfa22d07feafed580373cda21dd5b35 Signed-off-by: Clément Bénier --- 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 insertions(+) diff --git a/conf/unit/afm-unit-debug.conf.in b/conf/unit/afm-unit-debug.conf.in index 582e723..7c74bc7 100644 --- a/conf/unit/afm-unit-debug.conf.in +++ b/conf/unit/afm-unit-debug.conf.in @@ -182,6 +182,7 @@ 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 7c7d36a..8497821 100644 --- a/conf/unit/afm-unit.conf.in +++ b/conf/unit/afm-unit.conf.in @@ -183,6 +183,7 @@ 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 1a5e71f..bc4608d 100644 --- a/conf/unit/generate-unit-conf/binder.inc +++ b/conf/unit/generate-unit-conf/binder.inc @@ -32,6 +32,7 @@ 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}}) \ -- 2.16.6