simplify afm-user-session process

[src/app-framework-main.git] / conf / unit / generate-unit-conf / service.inc

diff --git a/conf/unit/generate-unit-conf/service.inc b/conf/unit/generate-unit-conf/service.inc
index ac10f97..a860360 100644 (file)
--- a/conf/unit/generate-unit-conf/service.inc
+++ b/conf/unit/generate-unit-conf/service.inc
@@ -32,8 +32,8 @@ X-AFM--wgtdir={{:#metadata.install-dir}}
 X-AFM--workdir=APP_DATA_DIR/{{:id}}
 %nl
 
-Wants=afm-user-session@%i.target
-After=afm-user-setup@%i.service
+Requires=afm-user-session@%i.target
+After=user@%i.service
 
 # Adds check to smack
 ConditionSecurity=smack
@@ -46,6 +46,13 @@ BindsTo=UNIT_NAME_SOCKET_FOR({{name}})
 After=UNIT_NAME_SOCKET_FOR({{name}})
 {{/value=auto|ws}}
 {{/required-api}}
+{{#provided-api}}
+{{#value=ws|auto}}
+Requires=UNIT_NAME_SOCKET_FOR({{name}})
+After=UNIT_NAME_SOCKET_FOR({{name}})
+{{/value=ws|auto}}
+{{/provided-api}}
+
 %nl
 
 [Service]
@@ -106,8 +113,8 @@ IF_PERM(:system:run-by-default)
 ; 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
 ENDIF
 
 %end systemd-unit