Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Revert "afm-unit: add autoapi in required-api feature""
[src/app-framework-main.git]
/
conf
/
unit
/
generate-unit-conf
/
binder.inc
diff --git
a/conf/unit/generate-unit-conf/binder.inc
b/conf/unit/generate-unit-conf/binder.inc
index
98efd4e
..
30c25d5
100644
(file)
--- a/
conf/unit/generate-unit-conf/binder.inc
+++ b/
conf/unit/generate-unit-conf/binder.inc
@@
-1,10
+1,10
@@
dnl vim: set filetype=sysctl.conf.m4 syntax=sysctl.conf.m4:
IF_AGL_DEVEL
dnl vim: set filetype=sysctl.conf.m4 syntax=sysctl.conf.m4:
IF_AGL_DEVEL
-X-AFM-http-port={{:#meta
data
.http-port}}
+X-AFM-http-port={{:#meta
target
.http-port}}
ELSE
IF_NOT_CONTENT(application/vnd.agl.service)
ELSE
IF_NOT_CONTENT(application/vnd.agl.service)
-X-AFM--http-port={{:#meta
data
.http-port}}
+X-AFM--http-port={{:#meta
target
.http-port}}
ENDIF
ENDIF
ENDIF
ENDIF
@@
-17,29
+17,34
@@
IF_AGL_DEVEL \
--verbose \
--verbose \
--monitoring \
--verbose \
--verbose \
--monitoring \
- --port={{:#meta
data
.http-port}} \
+ --port={{:#meta
target
.http-port}} \
--token=HELLO \
--roothttp=ON_CONTENT(application/vnd.agl.service, ., ON_PERM(:public:no-htdocs, ., htdocs)) \
ELSE \
IF_CONTENT(application/vnd.agl.service) \
--no-httpd \
ELSE \
--token=HELLO \
--roothttp=ON_CONTENT(application/vnd.agl.service, ., ON_PERM(:public:no-htdocs, ., htdocs)) \
ELSE \
IF_CONTENT(application/vnd.agl.service) \
--no-httpd \
ELSE \
- --port={{:#meta
data
.http-port}} \
+ --port={{:#meta
target
.http-port}} \
--random-token \
--roothttp=ON_PERM(:public:no-htdocs, ., htdocs) \
ENDIF \
ENDIF \
ON_PERM(:public:applications:read, --alias=/icons:{{:#metadata.icons-dir}}) \
{{#required-api}} \
--random-token \
--roothttp=ON_PERM(:public:no-htdocs, ., htdocs) \
ENDIF \
ENDIF \
ON_PERM(:public:applications:read, --alias=/icons:{{:#metadata.icons-dir}}) \
{{#required-api}} \
- ON_VALUE(auto|ws, --ws-client=unix:
USER_RUN_DIR/apis/ws
/{{name}}) \
+ ON_VALUE(auto|ws, --ws-client=unix:
API_PATH_WS
/{{name}}) \
ON_VALUE(dbus, --dbus-client={{name}}) \
ON_VALUE(dbus, --dbus-client={{name}}) \
- ON_VALUE(link, --binding=USER_RUN_DIR/apis/lib/{{name}}) \
ON_VALUE(cloud, --cloud-client={{name}}) \
ON_VALUE(local, --binding={{:#metadata.install-dir}}/{{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-api}} \
+ {{#required-binding}} \
+ ON_VALUE(local, --binding={{:#metadata.install-dir}}/{{name}}) \
+ ON_VALUE(extern, --binding=API_PATH_LINK/{{name}}) \
+ {{/required-binding}} \
{{#provided-api}} \
ON_VALUE(auto|ws, --ws-server=sd:{{name}}) \
ON_VALUE(dbus, --dbus-server={{name}}) \
{{#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)
{{/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)