diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2018-02-27 15:07:54 +0100 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2018-02-28 09:15:17 +0100 |
| commit | 3d50d615fbd4322315dd66859d886576e208b36d (patch) | |
| tree | cb94b3865a65f5210d253eb52763ea68bfad68ba /conf/unit/afm-unit-debug.conf.in | |
| parent | e6fc32e9185b5d6c1ea97714a37f1112b54f64fb (diff) | |
Add configuration variables for runtime socket dirs
2 new configuration variables:
- afm_platform_rundir (default /run/platform)
Path to location of platform runtime sockets
- afm_users_rundir (default /run/user)
Path to location of users runtime sockets
Change-Id: I65007fee1ca2ce6f1247a67ba0b121f97c08f209
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'conf/unit/afm-unit-debug.conf.in')
| -rw-r--r-- | conf/unit/afm-unit-debug.conf.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/conf/unit/afm-unit-debug.conf.in b/conf/unit/afm-unit-debug.conf.in index fbf530a..ee6b69b 100644 --- a/conf/unit/afm-unit-debug.conf.in +++ b/conf/unit/afm-unit-debug.conf.in @@ -145,11 +145,11 @@ 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=XDG_RUNTIME_DIR=@afm_users_rundir@/%i +Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=@afm_users_rundir@/%i/bus ; Needed to enable debug Environment=AFM_ID={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} -EnvironmentFile=-/var/run/afm-debug/{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}.env +EnvironmentFile=-@afm_platform_rundir@/debug/{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}.env SyslogIdentifier=afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} StandardInput=null StandardOutput=journal @@ -172,9 +172,9 @@ ExecStart=/usr/bin/afb-daemon \ --roothttp={{#content.type=application/vnd.agl.service}}.{{/content.type=application/vnd.agl.service}}{{^content.type=application/vnd.agl.service}}{{#required-permission.urn:AGL:permission::public:no-htdocs}}.{{/required-permission.urn:AGL:permission::public:no-htdocs}}{{^required-permission.urn:AGL:permission::public:no-htdocs}}htdocs{{/required-permission.urn:AGL:permission::public:no-htdocs}}{{/content.type=application/vnd.agl.service}} \ {{#required-permission.urn:AGL:permission::public:applications:read}}--alias=/icons:{{:#metadata.icons-dir}}{{/required-permission.urn:AGL:permission::public:applications:read}} \ {{#required-api}} \ - {{#value=auto|ws}}--ws-client=unix:/run/user/%i/apis/ws/{{name}}{{/value=auto|ws}} \ + {{#value=auto|ws}}--ws-client=unix:@afm_users_rundir@/%i/apis/ws/{{name}}{{/value=auto|ws}} \ {{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \ - {{#value=link}}--binding=/run/user/%i/apis/lib/{{name}}{{/value=link}} \ + {{#value=link}}--binding=@afm_users_rundir@/%i/apis/lib/{{name}}{{/value=link}} \ {{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \ {{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \ {{/required-api}} \ @@ -217,7 +217,7 @@ DefaultDependencies=no SmackLabel=* SmackLabelIPIn=* SmackLabelIPOut=* -ListenStream=/run/user/%i/apis/ws/{{name}} +ListenStream=@afm_users_rundir@/%i/apis/ws/{{name}} FileDescriptorName={{name}} Service=afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}}@%i.service %nl |