X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Fafm-unit.conf.in;h=18de05a3205c946681042482cf0f63d593962624;hb=1b079c90ed954cca65a7b07d5480e75d46217b85;hp=237f8ce00473beecd99aab93c527b12ac086d25f;hpb=26ff2316de1367079beddbbc2eebabeb7a665b5d;p=src%2Fapp-framework-main.git

diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in
index 237f8ce..18de05a 100644
--- a/conf/afm-unit.conf.in
+++ b/conf/afm-unit.conf.in
@@ -78,7 +78,7 @@
 ;---------------------------------------------------------------------------------
 %begin systemd-unit
 
-# auto generated by wgtpkg-unit for {{id}} version {{version}} target {{:#target}} of {{idaver}}
+# auto generated by wgtpkg-unit for {{:id}} version {{:version}} target {{:#target}} of {{:idaver}}
 %nl
 
 [Unit]
@@ -86,18 +86,26 @@ Description={{description}}
 X-AFM-description={{description}}
 X-AFM-name={{name.content}}
 X-AFM-shortname={{name.short}}
+#***************
+# use X-AFM-id={{:id}}--{{:ver}}--{{:#target}}
+# instead of:
 X-AFM-id={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
-X-AFM-version={{version}}
+# when home screen will use real ids
+#**************
+X-AFM-version={{:version}}
 X-AFM-author={{author.content}}
 X-AFM-author-email={{author.email}}
 X-AFM-width={{width}}
 X-AFM-height={{height}}
-X-AFM--ID={{id}}
+{{#icon}}
+X-AFM-icon={{:#metadata.install-dir}}/{{:src}}
+{{/icon}}
+X-AFM--ID={{:id}}
 X-AFM--target-name={{:#target}}
 X-AFM--content={{content.src}}
 X-AFM--type={{content.type}}
 X-AFM--wgtdir={{:#metadata.install-dir}}
-X-AFM--workdir={{&#metadata.app-data-dir}}/{{id}}
+X-AFM--workdir={{&#metadata.app-data-dir}}/{{:id}}
 %nl
 
 Wants=sockets.target
@@ -109,17 +117,24 @@ ConditionSecurity=smack
 # Automatic bound to required api
 {{#required-api}}
 {{#value=auto|ws}}
-BindsTo=afm-api-ws-{{name}}.socket
-After=afm-api-ws-{{name}}.socket
+BindsTo=afm-api-ws-{{name}}@%i.socket
+After=afm-api-ws-{{name}}@%i.socket
 {{/value=auto|ws}}
 {{/required-api}}
 %nl
 
 [Service]
 EnvironmentFile=-@afm_confdir@/unit.env.d/*
-SmackProcessLabel=User::App::{{id}}
+SmackProcessLabel=User::App::{{:id}}
 SuccessExitStatus=0 SIGKILL
 
+PAMName=su
+User=%i
+
+CapabilityBoundingSet=
+AmbientCapabilities=
+SecureBits=no-setuid-fixup-locked
+
 {{#required-permission}}
   {{#urn:AGL:permission::platform:no-oom}}      OOMScoreAdjust=-500             {{/urn:AGL:permission::platform:no-oom}}
   {{#urn:AGL:permission::partner:real-time}}    IOSchedulingClass=realtime      {{/urn:AGL:permission::partner:real-time}}
@@ -129,17 +144,17 @@ SuccessExitStatus=0 SIGKILL
 {{/required-permission}}
 %nl
 
-WorkingDirectory=-{{&#metadata.app-data-dir}}/{{id}}
-ExecStartPre=/bin/mkdir -p {{&#metadata.app-data-dir}}/{{id}}
+WorkingDirectory=-{{&#metadata.app-data-dir}}/{{:id}}
+ExecStartPre=/bin/mkdir -p {{&#metadata.app-data-dir}}/{{:id}}
 Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}}
 Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}
 
-%systemd-unit user
+%systemd-unit system
 {{#required-permission.urn:AGL:permission::public:hidden}}\
-%systemd-unit service afm-service-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
+%systemd-unit service afm-service-{{:id}}--{{:ver}}--{{:#target}}@
 {{/required-permission.urn:AGL:permission::public:hidden}}\
 {{^required-permission.urn:AGL:permission::public:hidden}}\
-%systemd-unit service afm-appli-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
+%systemd-unit service afm-appli-{{:id}}--{{:ver}}--{{:#target}}@
 {{/required-permission.urn:AGL:permission::public:hidden}}\
 
 Environment=LD_LIBRARY_PATH=$ORIGIN/lib
@@ -162,10 +177,7 @@ ExecStart=/usr/bin/afb-daemon \
 	--name afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} \
 	--rootdir={{:#metadata.install-dir}} \
 	--workdir={{&#metadata.app-data-dir}}/{{id}} \
-	{{#content.type=application/vnd.agl.service}}\
-		--no-httpd \
-	{{/content.type=application/vnd.agl.service}}\
-	{{^content.type=application/vnd.agl.service}}\
+	{{^content.type=application/vnd.agl.service}} \
 		--port={{:#metadata.http-port}} \
 		--random-token \
 		{{#required-permission.urn:AGL:permission::public:no-htdocs}}\
@@ -174,7 +186,10 @@ ExecStart=/usr/bin/afb-daemon \
 		{{^required-permission.urn:AGL:permission::public:no-htdocs}}\
 			--roothttp=htdocs \
 		{{/required-permission.urn:AGL:permission::public:no-htdocs}}\
-	{{/content.type=application/vnd.agl.service}}\
+	{{/content.type=application/vnd.agl.service}} \
+	{{#content.type=application/vnd.agl.service}} \
+		--no-httpd \
+	{{/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}}\
@@ -255,10 +270,10 @@ WantedBy=default.target
 
 %begin systemd-unit
 
-# auto generated by wgtpkg-unit for {{id}} version {{version}} target {{:#target}} of {{idaver}}
+# auto generated by wgtpkg-unit for {{:id}} version {{:version}} target {{:#target}} of {{:idaver}}
 #
-%systemd-unit user
-%systemd-unit socket afm-api-ws-{{name}}
+%systemd-unit system
+%systemd-unit socket afm-api-ws-{{name}}@
 
 [Socket]
 SmackLabel=*
@@ -266,10 +281,10 @@ ListenStream=%t/apis/ws/{{name}}
 FileDescriptorName={{name}}
 
 {{#required-permission.urn:AGL:permission::public:hidden}}\
-Service=afm-service-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}.service
+Service=afm-service-{{:id}}--{{:ver}}--{{:#target}}@%i.service
 {{/required-permission.urn:AGL:permission::public:hidden}}\
 {{^required-permission.urn:AGL:permission::public:hidden}}\
-Service=afm-appli-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}.service
+Service=afm-appli-{{:id}}--{{:ver}}--{{:#target}}@%i.service
 {{/required-permission.urn:AGL:permission::public:hidden}}\
 
 ;---------------------------------------------------------------------------------