aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2018-08-03 15:10:53 +0200
committerJose Bollo <jose.bollo@iot.bzh>2018-10-19 14:13:02 +0200
commit24f0c203cc62f478b2759b184f1b4ed7a1c093ca (patch)
treeccf80589aea5d29ac6e0e810ba1a62737f949324 /conf
parent9e1d25b1ca04cf381a3a4fc96197c5545e55fc27 (diff)
Add the ability to access binding through tcp
This commit introduce "tcp", a new type of provided/required api. It appears in the config.xml as below: <urn:AGL:widget:provided-api> <param "name"="HOST:PORT/API" "value"="tcp"> <urn:AGL:widget:required-api> <param "name"="HOST:PORT/API" "value"="tcp"> This implementation is a draft. The service exposed can not start automatically. Use it with the permission urn:AGL:permission::system:run-by-default. Change-Id: Ic593f0d891692ca0c777c49057ec54c37fc55cc0 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'conf')
-rw-r--r--conf/unit/afm-unit-debug.conf.in2
-rw-r--r--conf/unit/afm-unit.conf.in2
-rw-r--r--conf/unit/generate-unit-conf/binder.inc2
3 files changed, 6 insertions, 0 deletions
diff --git a/conf/unit/afm-unit-debug.conf.in b/conf/unit/afm-unit-debug.conf.in
index accf8ca..f7e37a2 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 \
{{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \
{{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \
{{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \
+ {{#value=tcp}}--ws-client=tcp:{{name}}{{/value=tcp}} \
{{/required-api}} \
{{#required-binding}} \
{{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \
@@ -190,6 +191,7 @@ ExecStart=/usr/bin/afb-daemon \
{{#provided-api}} \
{{#value=auto|ws}}--ws-server=sd:{{name}}{{/value=auto|ws}} \
{{#value=dbus}}--dbus-server={{name}}{{/value=dbus}} \
+ {{#value=tcp}}--ws-server=tcp:{{name}}{{/value=tcp}} \
{{/provided-api}} \
{{#content.type=text/html}}--exec /usr/bin/web-runtime http://localhost:@p/{{content.src}}?token=@t{{/content.type=text/html}} \
{{#content.type=application/vnd.agl.native}}--exec {{:#metadata.install-dir}}/{{content.src}} @p @t{{/content.type=application/vnd.agl.native}}
diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in
index e1d2112..4672c98 100644
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -182,6 +182,7 @@ ExecStart=/usr/bin/afb-daemon \
{{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \
{{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \
{{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \
+ {{#value=tcp}}--ws-client=tcp:{{name}}{{/value=tcp}} \
{{/required-api}} \
{{#required-binding}} \
{{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \
@@ -190,6 +191,7 @@ ExecStart=/usr/bin/afb-daemon \
{{#provided-api}} \
{{#value=auto|ws}}--ws-server=sd:{{name}}{{/value=auto|ws}} \
{{#value=dbus}}--dbus-server={{name}}{{/value=dbus}} \
+ {{#value=tcp}}--ws-server=tcp:{{name}}{{/value=tcp}} \
{{/provided-api}} \
{{#content.type=text/html}}--exec /usr/bin/web-runtime http://localhost:@p/{{content.src}}?token=@t{{/content.type=text/html}} \
{{#content.type=application/vnd.agl.native}}--exec {{:#metadata.install-dir}}/{{content.src}} @p @t{{/content.type=application/vnd.agl.native}}
diff --git a/conf/unit/generate-unit-conf/binder.inc b/conf/unit/generate-unit-conf/binder.inc
index 57f4166..8f3bd7d 100644
--- a/conf/unit/generate-unit-conf/binder.inc
+++ b/conf/unit/generate-unit-conf/binder.inc
@@ -35,6 +35,7 @@ ENDIF \
ON_VALUE(dbus, --dbus-client={{name}}) \
ON_VALUE(cloud, --cloud-client={{name}}) \
ON_VALUE(local, --binding={{:#metadata.install-dir}}/{{name}}) \
+ ON_VALUE(tcp, --ws-client=tcp:{{name}}) \
{{/required-api}} \
{{#required-binding}} \
ON_VALUE(local, --binding={{:#metadata.install-dir}}/{{name}}) \
@@ -43,6 +44,7 @@ ENDIF \
{{#provided-api}} \
ON_VALUE(auto|ws, --ws-server=sd:{{name}}) \
ON_VALUE(dbus, --dbus-server={{name}}) \
+ ON_VALUE(tcp, --ws-server=tcp:{{name}}) \
{{/provided-api}} \
ON_CONTENT(text/html, --exec /usr/bin/web-runtime http://localhost:@p/{{content.src}}?token=@t) \
ON_CONTENT(application/vnd.agl.native, --exec {{:#metadata.install-dir}}/{{content.src}} @p @t)