X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Funit%2Fafm-unit.conf.in;h=806784000843b749cfb64a6dd261193d0f74db60;hb=80c20308d798433be6f59ce927da4a1920ecf3b9;hp=f5e25ea06d27c7a2f16f8ac21bb7be7f06654e70;hpb=19e745ef835f1e3346c238ca0c1cf908d31ac9ec;p=src%2Fapp-framework-main.git

diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in
index f5e25ea..8067840 100644
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -107,6 +107,7 @@ X-AFM--workdir=/home/%i/app-data/{{:id}}
 %nl
 Requires=afm-user-session@%i.target
 After=user@%i.service
+After=Network.target
 # Adds check to smack
 ConditionSecurity=smack
 %nl
@@ -136,16 +137,20 @@ SmackProcessLabel=User::App::{{:id}}
 SuccessExitStatus=0 SIGKILL
 User=%i
 Slice=user-%i.slice
-#CapabilityBoundingSet=
+CapabilityBoundingSet=
 #AmbientCapabilities=
 {{#required-permission.urn:AGL:permission::platform:no-oom}}OOMScoreAdjust=-500{{/required-permission.urn:AGL:permission::platform:no-oom}}
 {{#required-permission.urn:AGL:permission::partner:real-time}}IOSchedulingClass=realtime{{/required-permission.urn:AGL:permission::partner:real-time}}
-{{#required-permission.urn:AGL:permission::public:display}}SupplementaryGroups=display{{/required-permission.urn:AGL:permission::public:display}}
 {{^required-permission.urn:AGL:permission::public:syscall:clock}}SystemCallFilter=~@clock{{/required-permission.urn:AGL:permission::public:syscall:clock}}
+#{{#required-permission.urn:AGL:permission::public:display}}SupplementaryGroups=display{{/required-permission.urn:AGL:permission::public:display}}
+SupplementaryGroups=display
 %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,13 +177,14 @@ 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}} \
 	{{#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}} \