Add configuration variables for runtime socket dirs

[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..9fa3794 100644 (file)
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -105,8 +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
-After=afm-user-setup@%i.service
+Requires=afm-user-session@%i.target
+After=user@%i.service
 # Adds check to smack
 ConditionSecurity=smack
 %nl
@@ -117,6 +117,12 @@ BindsTo=afm-api-ws-{{name}}@%i.socket
 After=afm-api-ws-{{name}}@%i.socket
 {{/value=auto|ws}}
 {{/required-api}}
+{{#provided-api}}
+{{#value=ws|auto}}
+Requires=afm-api-ws-{{name}}@%i.socket
+After=afm-api-ws-{{name}}@%i.socket
+{{/value=ws|auto}}
+{{/provided-api}}
 %nl
 [Service]
 EnvironmentFile=-@afm_confdir@/unit.env.d/*
@@ -134,13 +140,13 @@ Slice=user-%i.slice
 WorkingDirectory=-/home/%i/app-data/{{:id}}
 ExecStartPre=/bin/mkdir -p /home/%i/app-data/{{:id}}
 Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}}
-Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}
+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}}
 Environment=XDG_CONFIG_HOME=/home/%i/app-data/{{:id}}
 Environment=XDG_CACHE_HOME=/home/%i/app-data/{{:id}}
-Environment=XDG_RUNTIME_DIR=/run/user/%i
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%i/bus
-Environment=LD_LIBRARY_PATH=$ORIGIN/lib
+Environment=XDG_RUNTIME_DIR=@afm_users_rundir@/%i
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=@afm_users_rundir@/%i/bus
 SyslogIdentifier=afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
 StandardInput=null
 StandardOutput=journal
@@ -166,9 +172,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:/run/user/%i/apis/ws/{{name}}{{/value=auto|ws}} \
+               {{#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=/run/user/%i/apis/lib/{{name}}{{/value=link}} \
+               {{#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}} \
        {{/required-api}} \
@@ -190,8 +196,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,16 +211,19 @@ WantedBy=agl-user-session@.target
 %systemd-unit socket afm-api-ws-{{name}}@
 [Unit]
 Description=Provides api {{name}} for user %i
-After=afm-user-setup@%i.service
+After=user@%i.service
+DefaultDependencies=no
 [Socket]
 SmackLabel=*
-ListenStream=/run/user/%i/apis/ws/{{name}}
+SmackLabelIPIn=*
+SmackLabelIPOut=*
+ListenStream=@afm_users_rundir@/%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=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}}