X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Fafm-unit.conf.in;h=07ee8a0c363cfeadc212e41f2b20aa2029c881d7;hb=711b1d544888d56261ad2c01be13034fb7f78dce;hp=5d4a58c44626ac64a049e5ee84a18a6c4d9ee9c6;hpb=db0f29830b95f917029d5b91267e3493c0444d58;p=src%2Fapp-framework-main.git

diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in
index 5d4a58c..07ee8a0 100644
--- a/conf/afm-unit.conf.in
+++ b/conf/afm-unit.conf.in
@@ -3,6 +3,10 @@
 ;
 ;    afm-unit.conf
 ;
+; Mode:
+;
+;    RELEASE
+;
 ; Role:
 ;
 ;    Configure how installation of widget produces unit files for systemd
@@ -72,211 +76,145 @@
 ;
 ;---------------------------------------------------------------------------------
 {{#targets}}
-
 ;---------------------------------------------------------------------------------
-;----        P R O V I D E D   U N I T S                                      ----
+;----         M A I N    P A R T    O F   T H E   S E R V I C E               ----
 ;---------------------------------------------------------------------------------
 %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]
 Description={{description}}
 X-AFM-description={{description}}
 X-AFM-name={{name.content}}
 X-AFM-shortname={{name.short}}
 X-AFM-id={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
-X-AFM-version={{version}}
+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=/home/%i/app-data/{{:id}}
 %nl
-
 Wants=sockets.target
-
 # Adds check to smack
 ConditionSecurity=smack
 %nl
-
 # 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
-
-{{#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}}
-#  {{^urn:AGL:permission::partner:real-time}}    RestrictRealtime=on             {{/urn:AGL:permission::partner:real-time}}
-  {{#urn:AGL:permission::public:display}}       SupplementaryGroups=display     {{/urn:AGL:permission::public:display}}
-  {{^urn:AGL:permission::public:syscall:clock}} SystemCallFilter=~@clock        {{/urn:AGL:permission::public:syscall:clock}}
-{{/required-permission}}
+#PAMName=su
+User=%i
+Slice=user-%i.slice
+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}}
 %nl
-
-WorkingDirectory=-{{&#metadata.app-data-dir}}/{{id}}
-ExecStartPre=/bin/mkdir -p {{&#metadata.app-data-dir}}/{{id}}
+WorkingDirectory=-/home/%i/app-data/{{:id}}
+ExecStartPre=/bin/mkdir -p /home/%i/app-data/{{:id}}
 Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}}
-
-%systemd-unit user
-{{#required-permission.urn:AGL:permission::public:hidden}}\
-%systemd-unit service afm-service-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
-{{/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}}
-{{/required-permission.urn:AGL:permission::public:hidden}}\
-
-
+Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}
+Environment=XDG_DATA_HOME=/home/%i/app-data/{{:id}}
+Environment=XDG_CONFIG_HOME=/home/%i/app-data/{{:id}}
+Environment=XDG_CACHE_HOME=/home/%i/app-data/{{:id}}
+Environment=XDG_RUNTIME_DIR=/run/user/%i
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%i/bus
+Environment=LD_LIBRARY_PATH=$ORIGIN/lib
+%systemd-unit system
+%systemd-unit service afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}}@
+SyslogIdentifier=afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
+StandardInput=null
+StandardOutput=journal
+StandardError=journal
 ;---------------------------------------------------------------------------------
 ;----   text/html  application/vnd.agl.native  application/vnd.agl.service    ----
 ;---------------------------------------------------------------------------------
 {{#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}}
 {{/content.type=application/vnd.agl.service}}
-
 ExecStart=/usr/bin/afb-daemon \
-	{{^content.type=application/vnd.agl.service}}\
+	--name afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} \
+	--rootdir={{:#metadata.install-dir}} \
+	--workdir=/home/%i/app-data/{{id}} \
+	{{#content.type=application/vnd.agl.service}} \
+		--no-httpd \
+	{{/content.type=application/vnd.agl.service}}{{^content.type=application/vnd.agl.service}} \
 		--port={{:#metadata.http-port}} \
 		--random-token \
-	{{/content.type=application/vnd.agl.service}}\
-	--rootdir={{:#metadata.install-dir}} \
-	--workdir={{&#metadata.app-data-dir}}/{{id}} \
-	{{#required-permission.urn:AGL:permission::public:no-htdocs}}\
-		--roothttp=. \
-	{{/required-permission.urn:AGL:permission::public:no-htdocs}}\
-	{{^required-permission.urn:AGL:permission::public:no-htdocs}}\
-		--roothttp=htdocs \
-	{{/required-permission.urn:AGL:permission::public:no-htdocs}}\
-	{{#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-client=unix:%t/apis/ws/{{name}} \
-		{{/value=auto}}\
-		{{#value=ws}}\
-			--ws-client=unix:%t/apis/ws/{{name}} \
-		{{/value=ws}}\
-		{{#value=dbus}}\
-			--dbus-client={{name}} \
-		{{/value=dbus}}\
-		{{#value=link}}\
-			--binding=%t/apis/lib/{{name}} \
-		{{/value=link}}\
-		{{#value=cloud}}\
-			--cloud-client={{name}} \
-		{{/value=cloud}}\
-		{{#value=local}}\
-			--binding={{:#metadata.install-dir}}/{{name}} \
-		{{/value=local}}\
-	{{/required-api}}\
-	{{#provided-api}}\
-		{{#value=auto}}\
-			{{^required-permission.urn:AGL:permission::partner:service:no-ws}}\
-				--ws-server=sd:{{name}} \
-			{{/required-permission.urn:AGL:permission::partner:service:no-ws}}\
-			{{^required-permission.urn:AGL:permission::partner:service:no-dbus}}\
-				--dbus-server={{name}} \
-			{{/required-permission.urn:AGL:permission::partner:service:no-dbus}}\
-		{{/value=auto}}\
-		{{#value=ws}}\
-			--ws-server=sd:{{name}} \
-		{{/value=ws}}\
-		{{#value=dbus}}\
-			--dbus-server={{name}} \
-		{{/value=dbus}}\
-	{{/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}}\
-	{{#content.type=application/vnd.agl.service}}\
-		--no-httpd
-	{{/content.type=application/vnd.agl.service}}
-
+		--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:%t/apis/ws/{{name}}{{/value=auto|ws}} \
+		{{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \
+		{{#value=link}}--binding=%t/apis/lib/{{name}}{{/value=link}} \
+		{{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \
+		{{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \
+	{{/required-api}} \
+	{{#provided-api}} \
+		{{#value=auto|ws}}--ws-server=sd:{{name}}{{/value=auto|ws}} \
+		{{#value=dbus}}--dbus-server={{name}}{{/value=dbus}} \
+	{{/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}}
 {{/content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}}
-
-
 ;---------------------------------------------------------------------------------
 ;----                 application/x-executable                                ----
 ;---------------------------------------------------------------------------------
 {{#content.type=application/x-executable}}
-
-Environment=LD_LIBRARY_PATH=$ORIGIN/$LIB
-
 ExecStart={{:#metadata.install-dir}}/{{content.src}}
-
 {{/content.type=application/x-executable}}
-
+{{#required-permission.urn:AGL:permission::system:run-by-default}}
 ;---------------------------------------------------------------------------------
 ; auto start
 ;---------------------------------------------------------------------------------
-{{#required-permission.urn:AGL:permission::system:run-by-default}}
-%nl
 [Install]
 WantedBy=default.target
 %systemd-unit wanted-by default.target
 {{/required-permission.urn:AGL:permission::system:run-by-default}}
-
 %end systemd-unit
-
-
 ;---------------------------------------------------------------------------------
 ;----        P R O V I D E D   A P I S                                        ----
 ;---------------------------------------------------------------------------------
-
 {{#provided-api}}
 {{#value=ws|auto}}
-
 %begin systemd-unit
-
-# auto generated by wgtpkg-unit for {{id}} version {{version}} target {{:#target}} of {{idaver}}
-#
-%systemd-unit user
-%systemd-unit socket afm-api-ws-{{name}}
-
+# auto generated by wgtpkg-unit for {{:id}} version {{:version}} target {{:#target}} of {{:idaver}}
+%systemd-unit system
+%systemd-unit socket afm-api-ws-{{name}}@
 [Socket]
 SmackLabel=*
 ListenStream=%t/apis/ws/{{name}}
 FileDescriptorName={{name}}
-
-{{#required-permission.urn:AGL:permission::public:hidden}}\
-Service=afm-service-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}.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
-{{/required-permission.urn:AGL:permission::public:hidden}}\
-
-;---------------------------------------------------------------------------------
+Service=afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}}@%i.service
 %nl
 [Install]
 WantedBy=sockets.target
 %systemd-unit wanted-by sockets.target
-;---------------------------------------------------------------------------------
-
 %end systemd-unit
-
 {{/value=ws|auto}}
 {{/provided-api}}
-
 {{/targets}}
-
+;---------------------------------------------------------------------------------
+; End of file afm-unit.conf mode RELEASE
+;---------------------------------------------------------------------------------