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 8f3bd7d..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
-X-AFM-http-port={{:#metadata.http-port}}
+X-AFM-http-port={{:#metatarget.http-port}}
 ELSE
 IF_NOT_CONTENT(application/vnd.agl.service)
-X-AFM--http-port={{:#metadata.http-port}}
+X-AFM--http-port={{:#metatarget.http-port}}
 ENDIF
 ENDIF
 
@@ -17,21 +17,21 @@ IF_AGL_DEVEL \
        --verbose \
        --verbose \
        --monitoring \
-       --port={{:#metadata.http-port}} \
+       --port={{:#metatarget.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 \
-               --port={{:#metadata.http-port}} \
+               --port={{:#metatarget.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}} \
-               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(cloud,         --cloud-client={{name}}) \
                ON_VALUE(local,         --binding={{:#metadata.install-dir}}/{{name}}) \
@@ -39,7 +39,7 @@ ENDIF \
        {{/required-api}} \
        {{#required-binding}} \
                ON_VALUE(local,         --binding={{:#metadata.install-dir}}/{{name}}) \
-               ON_VALUE(extern,        --binding=USER_RUN_DIR/apis/link/{{name}}) \
+               ON_VALUE(extern,        --binding=API_PATH_LINK/{{name}}) \
        {{/required-binding}} \
        {{#provided-api}} \
                ON_VALUE(auto|ws,       --ws-server=sd:{{name}}) \