X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Funit%2Fafm-unit.conf.in;h=09befb6bf56438ae1c4984e24b42d71c695b5fc2;hb=3476b426fb3443ff909f8d607934e59601c7d508;hp=e1d2112662f1827f571ea0737e2183be2f345541;hpb=f03138790d27b2ce28e6db5756b553e0115321f0;p=src%2Fapp-framework-main.git

diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in
index e1d2112..09befb6 100644
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -104,9 +104,11 @@ X-AFM--content={{content.src}}
 X-AFM--type={{content.type}}
 X-AFM--wgtdir={{:#metadata.install-dir}}
 X-AFM--workdir=/home/%i/app-data/{{:id}}
+X-AFM--visibility={{#required-permission.urn:AGL:permission::public:hidden}}hidden{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}visible{{/required-permission.urn:AGL:permission::public:hidden}}
 %nl
 Requires=afm-user-session@%i.target
 After=user@%i.service
+After=Network.target
 # Adds check to smack
 ConditionSecurity=smack
 %nl
@@ -145,7 +147,10 @@ Slice=user-%i.slice
 %nl
 WorkingDirectory=-/home/%i/app-data/{{:id}}
 ExecStartPre=/bin/mkdir -p /home/%i/app-data/{{:id}}
+Environment=AFM_ID={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
 Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}}
+Environment=AFM_WORKDIR=/home/%i/app-data/{{:id}}
+Environment=AFM_WSAPI_DIR=@afm_users_rundir@/%i/apis/ws
 Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}/bin
 Environment=LD_LIBRARY_PATH={{:#metadata.install-dir}}/lib
 Environment=XDG_DATA_HOME=/home/%i/app-data/{{:id}}
@@ -162,7 +167,7 @@ StandardError=journal
 ;---------------------------------------------------------------------------------
 {{#content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}}
 {{^content.type=application/vnd.agl.service}}
-X-AFM--http-port={{:#metadata.http-port}}
+X-AFM--http-port={{:#metatarget.http-port}}
 {{/content.type=application/vnd.agl.service}}
 Type=notify
 ExecStart=/usr/bin/afb-daemon \
@@ -172,7 +177,7 @@ ExecStart=/usr/bin/afb-daemon \
 	{{#content.type=application/vnd.agl.service}} \
 		--no-httpd \
 	{{/content.type=application/vnd.agl.service}}{{^content.type=application/vnd.agl.service}} \
-		--port={{:#metadata.http-port}} \
+		--port={{:#metatarget.http-port}} \
 		--random-token \
 		--roothttp={{#required-permission.urn:AGL:permission::public:no-htdocs}}.{{/required-permission.urn:AGL:permission::public:no-htdocs}}{{^required-permission.urn:AGL:permission::public:no-htdocs}}htdocs{{/required-permission.urn:AGL:permission::public:no-htdocs}} \
 	{{/content.type=application/vnd.agl.service}} \
@@ -182,6 +187,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 +196,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}}
@@ -213,6 +220,7 @@ WantedBy=afm-user-session@.target
 ;----        P R O V I D E D   A P I S                                      ----
 ;-------------------------------------------------------------------------------
 {{#provided-api}}
+{{#value=ws|auto}}
 ;-------------------------------------------------------------------------------
 ;----        T H E   S E R V I C E   O F   T H E   A P I                    ----
 ;-------------------------------------------------------------------------------
@@ -239,7 +247,6 @@ ExecStart=/bin/true
 ;-------------------------------------------------------------------------------
 ;----        T H E   S O C K E T   O F   T H E   A P I                      ----
 ;-------------------------------------------------------------------------------
-{{#value=ws|auto}}
 %begin systemd-unit
 # auto generated by wgtpkg-unit for {{:id}} version {{:version}} target {{:#target}} of {{:idaver}}
 %systemd-unit system