Rework on systemd start of user sessions

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

diff --git a/conf/afm-unit-debug.conf.in b/conf/unit/afm-unit-debug.conf.in
similarity index 96%
rename from conf/afm-unit-debug.conf.in
rename to conf/unit/afm-unit-debug.conf.in
index 2b8a899..8c435d5 100644 (file)
--- a/conf/afm-unit-debug.conf.in
+++ b/conf/unit/afm-unit-debug.conf.in
@@ -82,6 +82,8 @@
 %begin systemd-unit
 # auto generated by wgtpkg-unit for {{:id}} version {{:version}} target {{:#target}} of {{:idaver}}
 %nl
+%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}}@
 [Unit]
 Description={{description}}
 X-AFM-description={{description}}
@@ -103,7 +105,8 @@ X-AFM--type={{content.type}}
 X-AFM--wgtdir={{:#metadata.install-dir}}
 X-AFM--workdir=/home/%i/app-data/{{:id}}
 %nl
-Wants=sockets.target
+Wants=afm-user-session@%i.target
+After=afm-user-setup@%i.service
 # Adds check to smack
 ConditionSecurity=smack
 %nl
@@ -119,7 +122,6 @@ After=afm-api-ws-{{name}}@%i.socket
 EnvironmentFile=-@afm_confdir@/unit.env.d/*
 SmackProcessLabel=User::App::{{:id}}
 SuccessExitStatus=0 SIGKILL
-#PAMName=su
 User=%i
 Slice=user-%i.slice
 #CapabilityBoundingSet=
@@ -142,8 +144,6 @@ Environment=LD_LIBRARY_PATH=$ORIGIN/lib
 ; Needed to enable debug
 Environment=AFM_ID={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
 EnvironmentFile=-/var/run/afm-debug/{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}.env
-%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
@@ -190,8 +190,8 @@ ExecStart={{:#metadata.install-dir}}/{{content.src}}
 ; auto start
 ;---------------------------------------------------------------------------------
 [Install]
-WantedBy=default.target
-%systemd-unit wanted-by agl-user-session@.service
+WantedBy=agl-user-session@.target
+%systemd-unit wanted-by agl-user-session@.target
 {{/required-permission.urn:AGL:permission::system:run-by-default}}
 %end systemd-unit
 ;---------------------------------------------------------------------------------
@@ -203,6 +203,9 @@ WantedBy=default.target
 # auto generated by wgtpkg-unit for {{:id}} version {{:version}} target {{:#target}} of {{:idaver}}
 %systemd-unit system
 %systemd-unit socket afm-api-ws-{{name}}@
+[Unit]
+Description=Provides api {{name}} for user %i
+After=afm-user-setup@%i.service
 [Socket]
 SmackLabel=*
 ListenStream=/run/user/%i/apis/ws/{{name}}
@@ -210,8 +213,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=sockets.target
-%systemd-unit wanted-by agl-user-session@.service
+WantedBy=agl-user-session@.target
+%systemd-unit wanted-by agl-user-session@.target
 %end systemd-unit
 {{/value=ws|auto}}
 {{/provided-api}}