Config for afm-user-session

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

diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in
index 64c2f23..56a9075 100644 (file)
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -105,7 +105,8 @@ X-AFM--type={{content.type}}
 X-AFM--wgtdir={{:#metadata.install-dir}}
 X-AFM--workdir=/home/%i/app-data/{{:id}}
 %nl
-Wants=afm-user-session@%i.target
+Requires=afm-user-session@%i.target
+Requires=afm-user-setup@%i.service
 After=afm-user-setup@%i.service
 # Adds check to smack
 ConditionSecurity=smack
@@ -190,8 +191,8 @@ ExecStart={{:#metadata.install-dir}}/{{content.src}}
 ; auto start
 ;---------------------------------------------------------------------------------
 [Install]
-WantedBy=agl-user-session@.target
-%systemd-unit wanted-by agl-user-session@.target
+WantedBy=afm-user-session@.target
+%systemd-unit wanted-by afm-user-session@.target
 {{/required-permission.urn:AGL:permission::system:run-by-default}}
 %end systemd-unit
 ;---------------------------------------------------------------------------------
@@ -205,6 +206,7 @@ WantedBy=agl-user-session@.target
 %systemd-unit socket afm-api-ws-{{name}}@
 [Unit]
 Description=Provides api {{name}} for user %i
+Requires=afm-user-setup@%i.service
 After=afm-user-setup@%i.service
 [Socket]
 SmackLabel=*
@@ -213,8 +215,8 @@ 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=agl-user-session@.target
-%systemd-unit wanted-by agl-user-session@.target
+WantedBy=afm-user-session@.target
+%systemd-unit wanted-by afm-user-session@.target
 %end systemd-unit
 {{/value=ws|auto}}
 {{/provided-api}}