diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-03-24 15:46:11 +0100 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-03-24 18:52:19 +0100 |
| commit | 255c83029f56e8d90e7ce185b007c4ca65afec1e (patch) | |
| tree | e24bfd29b14779dfcd226ae4f24a5d12576f6c83 | |
| parent | dcf194289a6af8c0a6b6263a2686af8fa44a37f2 (diff) | |
Improve afm-unit.conf
This commit introduces a common clear name for
services bound to websockets.
It also improves the formating of commands to
be run by afb-daemon.
It also removes an unsupported key (commented).
Change-Id: I4e6e74eef50b89ba82d2c33d4c94faab8f07b587
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
| -rw-r--r-- | conf/afm-unit.conf | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/conf/afm-unit.conf b/conf/afm-unit.conf index 5fbba96..6712424 100644 --- a/conf/afm-unit.conf +++ b/conf/afm-unit.conf @@ -106,8 +106,10 @@ ConditionSecurity=smack # Automatic bound to required api {{#required-api}} -BindsTo=afm-api-{{name}} -After=afm-api-{{name}} +{{#value=auto|ws}} +BindsTo=afm-api-ws-{{name}} +After=afm-api-ws-{{name}} +{{/value=auto|ws}} {{/required-api}} %nl @@ -118,7 +120,7 @@ SuccessExitStatus=0 SIGKILL {{#required-permission}} {{#urn:AGL:permission::platform:no-oom}} OOMScoreAdjust=-500 {{/urn:AGL:permission::platform:no-oom}} {{#urn:AGL:permission::partner:real-time}} IOSchedulingClass=realtime {{/urn:AGL:permission::partner:real-time}} - {{^urn:AGL:permission::partner:real-time}} RestrictRealtime=on {{/urn:AGL:permission::partner:real-time}} +# {{^urn:AGL:permission::partner:real-time}} RestrictRealtime=on {{/urn:AGL:permission::partner:real-time}} {{#urn:AGL:permission::public:display}} SupplementaryGroups=display {{/urn:AGL:permission::public:display}} {{^urn:AGL:permission::public:syscall:clock}} SystemCallFilter=~@clock {{/urn:AGL:permission::public:syscall:clock}} {{/required-permission}} @@ -198,13 +200,13 @@ ExecStart=/usr/bin/afb-daemon \ {{/value=dbus}}\ {{/provided-api}}\ {{#content.type=text/html}}\ - --exec /usr/bin/web-runtime http://localhost:@p/{{content.src}}?token=@t \ + --exec /usr/bin/web-runtime http://localhost:@p/{{content.src}}?token=@t {{/content.type=text/html}}\ {{#content.type=application/vnd.agl.native}}\ - --exec {{:#metadata.install-dir}}/{{content.src}} @p @t \ + --exec {{:#metadata.install-dir}}/{{content.src}} @p @t {{/content.type=application/vnd.agl.native}}\ {{#content.type=application/vnd.agl.service}}\ - --no-httpd \ + --no-httpd {{/content.type=application/vnd.agl.service}} {{/content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}} @@ -248,7 +250,7 @@ WantedBy=default.target # auto generated by wgtpkg-unit for {{id}} version {{version}} target {{:#target}} of {{idaver}} # %systemd-unit user -%systemd-unit socket afm-socket-{{name}} +%systemd-unit socket afm-api-ws-{{name}} [Socket] SmackLabel=* |