X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Funit%2Fafm-unit.conf.in;h=353d83b5d1880826c8a2a8a2d4eded4a02dbc502;hb=9e6f77ae43af16d2af9bdb1ae8d20aed5deaac7d;hp=0cbe10300c132fa4bf4625e967fc294156dc4b60;hpb=8c7132a146aa744f167ea2fc45dcd8d53018ecc0;p=src%2Fapp-framework-main.git

diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in
index 0cbe103..353d83b 100644
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -107,10 +107,17 @@ 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
 # Automatic bound to required api
+{{#required-binding}}
+{{#value=extern}}
+BindsTo=afm-link-{{name}}@%i.service
+After=afm-link-{{name}}@%i.service
+{{/value=extern}}
+{{/required-binding}}
 {{#required-api}}
 {{#value=auto|ws}}
 BindsTo=afm-api-{{name}}@%i.service
@@ -119,8 +126,8 @@ After=afm-api-{{name}}@%i.service
 {{/required-api}}
 {{#provided-api}}
 {{#value=ws|auto}}
-Requires=afm-api-{{name}}@%i.service
-After=afm-api-{{name}}@%i.service
+Requires=afm-api-{{name}}@%i.socket
+After=afm-api-{{name}}@%i.socket
 {{/value=ws|auto}}
 {{/provided-api}}
 %nl
@@ -130,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}}
@@ -156,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 \
@@ -166,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}} \
@@ -174,13 +185,18 @@ ExecStart=/usr/bin/afb-daemon \
 	{{#required-api}} \
 		{{#value=auto|ws}}--ws-client=unix:@afm_users_rundir@/%i/apis/ws/{{name}}{{/value=auto|ws}} \
 		{{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \
-		{{#value=link}}--binding=@afm_users_rundir@/%i/apis/lib/{{name}}{{/value=link}} \
 		{{#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}} \
+		{{#value=extern}}--binding=@afm_users_rundir@/%i/apis/link/{{name}}{{/value=extern}} \
+	{{/required-binding}} \
 	{{#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}}
@@ -204,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                    ----
 ;-------------------------------------------------------------------------------
@@ -230,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
@@ -250,6 +266,27 @@ Service=afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/
 %end systemd-unit
 {{/value=ws|auto}}
 {{/provided-api}}
+;-------------------------------------------------------------------------------
+;----        P R O V I D E D   B I N D I N G                                ----
+;-------------------------------------------------------------------------------
+{{#provided-binding}}
+;-------------------------------------------------------------------------------
+;----        T H E   S E R V I C E   O F   T H E   B I N D I N G            ----
+;-------------------------------------------------------------------------------
+%begin systemd-unit
+# auto generated by wgtpkg-unit for {{:id}} version {{:version}} target {{:#target}} of {{:idaver}}
+%systemd-unit system
+%systemd-unit service afm-link-{{name}}@
+[Unit]
+Description=Provides binding {{name}} for user %i
+Requires=afm-user-setup@%i.service
+After=afm-user-setup@%i.service
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/ln -sf {{:#metadata.install-dir}}/{{value}} @afm_users_rundir@/%i/apis/link/{{name}}
+%end systemd-unit
+{{/provided-binding}}
 {{/targets}}
 ;---------------------------------------------------------------------------------
 ; End of file afm-unit.conf mode RELEASE