aboutsummaryrefslogtreecommitdiffstats
path: root/conf/unit
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2017-11-23 22:30:53 +0100
committerJosé Bollo <jose.bollo@iot.bzh>2017-11-24 17:44:58 +0100
commit5d36137251cb9325050ba56023ecd70743e132fd (patch)
treef2d8e77a5f397b07d88fab769228069d9fa31995 /conf/unit
parent5c7f99a0d33f5f4917bf91131445a87fc10296c0 (diff)
Config for afm-user-session
Change-Id: I6567b58fa0a6dd17deba4c7cccbf3b9f441730eb Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'conf/unit')
-rw-r--r--conf/unit/afm-unit-debug.conf.in4
-rw-r--r--conf/unit/afm-unit.conf.in4
-rw-r--r--conf/unit/generate-unit-conf/provided.inc1
-rw-r--r--conf/unit/generate-unit-conf/service.inc3
4 files changed, 9 insertions, 3 deletions
diff --git a/conf/unit/afm-unit-debug.conf.in b/conf/unit/afm-unit-debug.conf.in
index ab3b43a..fdea673 100644
--- a/conf/unit/afm-unit-debug.conf.in
+++ b/conf/unit/afm-unit-debug.conf.in
@@ -105,7 +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
+Requires=afm-user-session@%i.target
+Requires=afm-user-setup@%i.service
After=afm-user-setup@%i.service
# Adds check to smack
ConditionSecurity=smack
@@ -205,6 +206,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
[Socket]
SmackLabel=*
diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in
index 285d682..56a9075 100644
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -105,7 +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
+Requires=afm-user-session@%i.target
+Requires=afm-user-setup@%i.service
After=afm-user-setup@%i.service
# Adds check to smack
ConditionSecurity=smack
@@ -205,6 +206,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
[Socket]
SmackLabel=*
diff --git a/conf/unit/generate-unit-conf/provided.inc b/conf/unit/generate-unit-conf/provided.inc
index ff1ccf7..fd5d3ec 100644
--- a/conf/unit/generate-unit-conf/provided.inc
+++ b/conf/unit/generate-unit-conf/provided.inc
@@ -14,6 +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
[Socket]
diff --git a/conf/unit/generate-unit-conf/service.inc b/conf/unit/generate-unit-conf/service.inc
index b5292d7..273db3b 100644
--- a/conf/unit/generate-unit-conf/service.inc
+++ b/conf/unit/generate-unit-conf/service.inc
@@ -32,7 +32,8 @@ X-AFM--wgtdir={{:#metadata.install-dir}}
X-AFM--workdir=APP_DATA_DIR/{{:id}}
%nl
-Wants=afm-user-session@%i.target
+Requires=afm-user-session@%i.target
+Requires=afm-user-setup@%i.service
After=afm-user-setup@%i.service
# Adds check to smack