X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Fafm-unit.conf.in;h=8ccf861f6b37c847755fd9518c5c4600cc1ddd06;hb=88531199d2f46f8758dd1ef3262e567cc849c0b8;hp=3c3dc53e77692579cc8448d3859070b3394fc42a;hpb=597a0e00c4fcb1af745804be6249f08203084f62;p=src%2Fapp-framework-main.git

diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in
index 3c3dc53..8ccf861 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,15 +76,12 @@
 ;
 ;---------------------------------------------------------------------------------
 {{#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}}
 %nl
-
 [Unit]
 Description={{description}}
 X-AFM-description={{description}}
@@ -107,13 +108,10 @@ X-AFM--type={{content.type}}
 X-AFM--wgtdir={{:#metadata.install-dir}}
 X-AFM--workdir={{&#metadata.app-data-dir}}/{{:id}}
 %nl
-
 Wants=sockets.target
-
 # Adds check to smack
 ConditionSecurity=smack
 %nl
-
 # Automatic bound to required api
 {{#required-api}}
 {{#value=auto|ws}}
@@ -122,28 +120,20 @@ After=afm-api-ws-{{name}}@%i.socket
 {{/value=auto|ws}}
 {{/required-api}}
 %nl
-
 [Service]
 EnvironmentFile=-@afm_confdir@/unit.env.d/*
 SmackProcessLabel=User::App::{{:id}}
 SuccessExitStatus=0 SIGKILL
-
 #PAMName=su
 User=%i
 Slice=user-%i.slice
-
 CapabilityBoundingSet=
 AmbientCapabilities=
-
-{{#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}}
+{{#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}}
 Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}}
@@ -153,156 +143,83 @@ Environment=XDG_CONFIG_HOME={{&#metadata.app-data-dir}}/{{:id}}
 Environment=XDG_CACHE_HOME={{&#metadata.app-data-dir}}/{{:id}}
 Environment=XDG_RUNTIME_DIR=/run/user/%i
 Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%i/bus
-
-%systemd-unit system
-{{#required-permission.urn:AGL:permission::public:hidden}}\
-%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-{{:id}}--{{:ver}}--{{:#target}}@
-{{/required-permission.urn:AGL:permission::public:hidden}}\
-
 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 \
 	--name afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} \
 	--rootdir={{:#metadata.install-dir}} \
 	--workdir={{&#metadata.app-data-dir}}/{{id}} \
-	{{^content.type=application/vnd.agl.service}} \
-		--port={{:#metadata.http-port}} \
-		--random-token \
-		{{#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}}\
-	{{/content.type=application/vnd.agl.service}} \
 	{{#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 \
+		--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-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}}
-
+	{{#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}}
-
 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 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-{{:id}}--{{:ver}}--{{:#target}}@%i.service
-{{/required-permission.urn:AGL:permission::public:hidden}}\
-{{^required-permission.urn:AGL:permission::public:hidden}}\
-Service=afm-appli-{{:id}}--{{:ver}}--{{:#target}}@%i.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
+;---------------------------------------------------------------------------------