summaryrefslogtreecommitdiffstats
path: root/conf/unit
diff options
context:
space:
mode:
Diffstat (limited to 'conf/unit')
-rw-r--r--conf/unit/afm-unit-debug.conf.in6
-rw-r--r--conf/unit/afm-unit.conf.in6
-rw-r--r--conf/unit/generate-unit-conf/provided.inc3
-rw-r--r--conf/unit/generate-unit-conf/service.inc3
4 files changed, 6 insertions, 12 deletions
diff --git a/conf/unit/afm-unit-debug.conf.in b/conf/unit/afm-unit-debug.conf.in
index d7fa47d..ed8d094 100644
--- a/conf/unit/afm-unit-debug.conf.in
+++ b/conf/unit/afm-unit-debug.conf.in
@@ -106,8 +106,7 @@ X-AFM--wgtdir={{:#metadata.install-dir}}
X-AFM--workdir=/home/%i/app-data/{{:id}}
%nl
Requires=afm-user-session@%i.target
-Requires=afm-user-setup@%i.service
-After=afm-user-setup@%i.service
+After=user@%i.service
# Adds check to smack
ConditionSecurity=smack
%nl
@@ -212,8 +211,7 @@ WantedBy=afm-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
+After=user@%i.service
DefaultDependencies=no
[Socket]
SmackLabel=*
diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in
index bf9b32a..a0a397a 100644
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -106,8 +106,7 @@ X-AFM--wgtdir={{:#metadata.install-dir}}
X-AFM--workdir=/home/%i/app-data/{{:id}}
%nl
Requires=afm-user-session@%i.target
-Requires=afm-user-setup@%i.service
-After=afm-user-setup@%i.service
+After=user@%i.service
# Adds check to smack
ConditionSecurity=smack
%nl
@@ -212,8 +211,7 @@ WantedBy=afm-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
+After=user@%i.service
DefaultDependencies=no
[Socket]
SmackLabel=*
diff --git a/conf/unit/generate-unit-conf/provided.inc b/conf/unit/generate-unit-conf/provided.inc
index 4f96426..96ac72c 100644
--- a/conf/unit/generate-unit-conf/provided.inc
+++ b/conf/unit/generate-unit-conf/provided.inc
@@ -14,8 +14,7 @@ dnl vim: set filetype=sysctl.conf.m4 syntax=sysctl.conf.m4:
%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
+After=user@%i.service
DefaultDependencies=no
[Socket]
diff --git a/conf/unit/generate-unit-conf/service.inc b/conf/unit/generate-unit-conf/service.inc
index 2ff1de7..a860360 100644
--- a/conf/unit/generate-unit-conf/service.inc
+++ b/conf/unit/generate-unit-conf/service.inc
@@ -33,8 +33,7 @@ X-AFM--workdir=APP_DATA_DIR/{{:id}}
%nl
Requires=afm-user-session@%i.target
-Requires=afm-user-setup@%i.service
-After=afm-user-setup@%i.service
+After=user@%i.service
# Adds check to smack
ConditionSecurity=smack