unit.conf: Bound start to agl-user-session

[src/app-framework-main.git] / conf / afm-unit.conf.in

diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in
index 07ee8a0..5338df4 100644 (file)
--- a/conf/afm-unit.conf.in
+++ b/conf/afm-unit.conf.in
@@ -122,8 +122,8 @@ SuccessExitStatus=0 SIGKILL
 #PAMName=su
 User=%i
 Slice=user-%i.slice
-CapabilityBoundingSet=
-AmbientCapabilities=
+#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}}
@@ -152,6 +152,7 @@ StandardError=journal
 {{^content.type=application/vnd.agl.service}}
 X-AFM--http-port={{:#metadata.http-port}}
 {{/content.type=application/vnd.agl.service}}
+Type=notify
 ExecStart=/usr/bin/afb-daemon \
        --name afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} \
        --rootdir={{:#metadata.install-dir}} \
@@ -165,9 +166,9 @@ ExecStart=/usr/bin/afb-daemon \
        {{/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=auto|ws}}--ws-client=unix:/run/user/%i/apis/ws/{{name}}{{/value=auto|ws}} \
                {{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \
-               {{#value=link}}--binding=%t/apis/lib/{{name}}{{/value=link}} \
+               {{#value=link}}--binding=/run/user/%i/apis/lib/{{name}}{{/value=link}} \
                {{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \
                {{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \
        {{/required-api}} \
@@ -190,7 +191,7 @@ ExecStart={{:#metadata.install-dir}}/{{content.src}}
 ;---------------------------------------------------------------------------------
 [Install]
 WantedBy=default.target
-%systemd-unit wanted-by default.target
+%systemd-unit wanted-by agl-user-session@.service
 {{/required-permission.urn:AGL:permission::system:run-by-default}}
 %end systemd-unit
 ;---------------------------------------------------------------------------------
@@ -204,13 +205,13 @@ WantedBy=default.target
 %systemd-unit socket afm-api-ws-{{name}}@
 [Socket]
 SmackLabel=*
-ListenStream=%t/apis/ws/{{name}}
+ListenStream=/run/user/%i/apis/ws/{{name}}
 FileDescriptorName={{name}}
 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
+%systemd-unit wanted-by agl-user-session@.service
 %end systemd-unit
 {{/value=ws|auto}}
 {{/provided-api}}