diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-11-24 16:34:42 +0100 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-11-24 17:44:58 +0100 |
| commit | 1bec325ee85192eba57673750b9e4a77a1a970c8 (patch) | |
| tree | 31fa472c3a26021031d52633317fca322767fd93 /conf/unit | |
| parent | db8968de9b88e75828475c1e26b657af21b75beb (diff) | |
simplify afm-user-session process
Change-Id: If2739fd2c5a19d7cd31e117e1e79c0b51451552b
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'conf/unit')
| -rw-r--r-- | conf/unit/afm-unit-debug.conf.in | 6 | ||||
| -rw-r--r-- | conf/unit/afm-unit.conf.in | 6 | ||||
| -rw-r--r-- | conf/unit/generate-unit-conf/provided.inc | 3 | ||||
| -rw-r--r-- | conf/unit/generate-unit-conf/service.inc | 3 |
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 |