diff options
| -rw-r--r-- | conf/afm-unit-debug.conf.in | 6 | ||||
| -rw-r--r-- | conf/afm-unit.conf.in | 6 | ||||
| -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 |
5 files changed, 12 insertions, 9 deletions
diff --git a/conf/afm-unit-debug.conf.in b/conf/afm-unit-debug.conf.in index a4c458d..448a1ae 100644 --- a/conf/afm-unit-debug.conf.in +++ b/conf/afm-unit-debug.conf.in @@ -165,9 +165,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:%t/apis/ws/{{name}}{{/value=auto|ws}} \ + {{#value=auto|ws}}--ws-client=unix:/run/user/%i/apis/ws/{{name}}{{/value=auto|ws}} \ {{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \ - {{#value=link}}--binding=%t/apis/lib/{{name}}{{/value=link}} \ + {{#value=link}}--binding=/run/user/%i/apis/lib/{{name}}{{/value=link}} \ {{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \ {{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \ {{/required-api}} \ @@ -204,7 +204,7 @@ WantedBy=default.target %systemd-unit socket afm-api-ws-{{name}}@ [Socket] SmackLabel=* -ListenStream=%t/apis/ws/{{name}} +ListenStream=/run/user/%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 diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in index 07ee8a0..ce8437c 100644 --- a/conf/afm-unit.conf.in +++ b/conf/afm-unit.conf.in @@ -165,9 +165,9 @@ ExecStart=/usr/bin/afb-daemon \ {{/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:%t/apis/ws/{{name}}{{/value=auto|ws}} \ + {{#value=auto|ws}}--ws-client=unix:/run/user/%i/apis/ws/{{name}}{{/value=auto|ws}} \ {{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \ - {{#value=link}}--binding=%t/apis/lib/{{name}}{{/value=link}} \ + {{#value=link}}--binding=/run/user/%i/apis/lib/{{name}}{{/value=link}} \ {{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \ {{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \ {{/required-api}} \ @@ -204,7 +204,7 @@ WantedBy=default.target %systemd-unit socket afm-api-ws-{{name}}@ [Socket] SmackLabel=* -ListenStream=%t/apis/ws/{{name}} +ListenStream=/run/user/%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 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}} |