unit.cont: Refactor PATH and LD_LIBRARY_PATH

[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 285d682..ad5ecd7 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
 SyslogIdentifier=afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
 StandardInput=null
 StandardOutput=journal
@@ -205,7 +211,8 @@ WantedBy=afm-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}}