diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-11-20 16:07:09 +0100 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-11-24 17:44:57 +0100 |
| commit | ee6ac6c21e35553cae86f99bfde8cf05fe90be0a (patch) | |
| tree | 1a891a6a1322d83e0d87adcefc010f77d8e73709 /conf/generate-unit-conf | |
| parent | 236d2d857881d4d50da92eb4ed6d4721474806dc (diff) | |
unit.conf: Fix remaining %t
Change-Id: If9c1c0d8b805e7de6490c75f0465d3455e84eb36
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'conf/generate-unit-conf')
| -rw-r--r-- | conf/generate-unit-conf/afm-unit | 1 | ||||
| -rw-r--r-- | conf/generate-unit-conf/binder.inc | 4 | ||||
| -rw-r--r-- | conf/generate-unit-conf/provided.inc | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/conf/generate-unit-conf/afm-unit b/conf/generate-unit-conf/afm-unit index 68c02ba..9a8cd62 100644 --- a/conf/generate-unit-conf/afm-unit +++ b/conf/generate-unit-conf/afm-unit @@ -52,6 +52,7 @@ define( `UNIT_NAME_BASE', `afm-ON_PERM(`:public:hidden', `service', `appli')-{{: define( `UNIT_NAME_SERVICE', `UNIT_NAME_BASE%i.service') define( `UNIT_NAME_SOCKET_FOR', `afm-api-ws-$1@%i.socket') define( `APP_DATA_DIR', `/home/%i/app-data') +define( `USER_RUN_DIR', `/run/user/%i') ----------------------------------------------------------------------- -- diff --git a/conf/generate-unit-conf/binder.inc b/conf/generate-unit-conf/binder.inc index 855956b..2566365 100644 --- a/conf/generate-unit-conf/binder.inc +++ b/conf/generate-unit-conf/binder.inc @@ -30,9 +30,9 @@ ELSE \ ENDIF \ ON_PERM(:public:applications:read, --alias=/icons:{{:#metadata.icons-dir}}) \ {{#required-api}} \ - ON_VALUE(auto|ws, --ws-client=unix:%t/apis/ws/{{name}}) \ + ON_VALUE(auto|ws, --ws-client=unix:USER_RUN_DIR/apis/ws/{{name}}) \ ON_VALUE(dbus, --dbus-client={{name}}) \ - ON_VALUE(link, --binding=%t/apis/lib/{{name}}) \ + ON_VALUE(link, --binding=USER_RUN_DIR/apis/lib/{{name}}) \ ON_VALUE(cloud, --cloud-client={{name}}) \ ON_VALUE(local, --binding={{:#metadata.install-dir}}/{{name}}) \ {{/required-api}} \ diff --git a/conf/generate-unit-conf/provided.inc b/conf/generate-unit-conf/provided.inc index ea335ef..3e29294 100644 --- a/conf/generate-unit-conf/provided.inc +++ b/conf/generate-unit-conf/provided.inc @@ -15,7 +15,7 @@ dnl vim: set filetype=sysctl.conf.m4 syntax=sysctl.conf.m4: [Socket] SmackLabel=* -ListenStream=%t/apis/ws/{{name}} +ListenStream=USER_RUN_DIR/apis/ws/{{name}} FileDescriptorName={{name}} Service=UNIT_NAME_SERVICE @@ -27,6 +27,8 @@ WantedBy=sockets.target %end systemd-unit + + {{/value=ws|auto}} {{/provided-api}} |