diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-08-29 11:40:41 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-08-29 12:58:22 +0200 |
| commit | 9ece8f769e35eb9b211c4f21f613840fe3bea492 (patch) | |
| tree | 36c5df3901d58093f45020591d405eee1db809fc | |
| parent | 7c291a0adb54eb287a81e82bda4ef94c05dc2fd9 (diff) | |
afm-unit.conf: use option --name for setting binder name
Also enforce output to journal
Change-Id: I85957cfb8cc7e2264c9146ca18c352a0af347934
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
| -rw-r--r-- | conf/afm-unit-debug.conf.in | 9 | ||||
| -rw-r--r-- | conf/afm-unit.conf.in | 15 |
2 files changed, 17 insertions, 7 deletions
diff --git a/conf/afm-unit-debug.conf.in b/conf/afm-unit-debug.conf.in index ab687e0..748e27a 100644 --- a/conf/afm-unit-debug.conf.in +++ b/conf/afm-unit-debug.conf.in @@ -148,6 +148,10 @@ EnvironmentFile=-/var/run/afm-debug/{{idaver}}{{^#target=main}}@{{:#target}}{{/# Environment=LD_LIBRARY_PATH=$ORIGIN/lib +SyslogIdentifier={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} +StandardInput=null +StandardOutput=journal +StandardError=journal ;--------------------------------------------------------------------------------- ;---- text/html application/vnd.agl.native application/vnd.agl.service ---- @@ -157,10 +161,11 @@ Environment=LD_LIBRARY_PATH=$ORIGIN/lib X-AFM--http-port={{:#metadata.http-port}} ExecStart=/usr/bin/afb-daemon \ - --port={{:#metadata.http-port}} \ - --token=HELLO \ + --name {{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} \ --rootdir={{:#metadata.install-dir}} \ --workdir={{&#metadata.app-data-dir}}/{{id}} \ + --port={{:#metadata.http-port}} \ + --token=HELLO \ {{#content.type=application/vnd.agl.service}} \ --roothttp=. \ {{/content.type=application/vnd.agl.service}} \ diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in index 8eb9433..1b6f062 100644 --- a/conf/afm-unit.conf.in +++ b/conf/afm-unit.conf.in @@ -144,6 +144,10 @@ Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}} Environment=LD_LIBRARY_PATH=$ORIGIN/lib +SyslogIdentifier={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} +StandardInput=null +StandardOutput=journal +StandardError=journal ;--------------------------------------------------------------------------------- ;---- text/html application/vnd.agl.native application/vnd.agl.service ---- @@ -155,6 +159,12 @@ X-AFM--http-port={{:#metadata.http-port}} {{/content.type=application/vnd.agl.service}} ExecStart=/usr/bin/afb-daemon \ + --name {{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} \ + --rootdir={{:#metadata.install-dir}} \ + --workdir={{&#metadata.app-data-dir}}/{{id}} \ + {{#content.type=application/vnd.agl.service}}\ + --no-httpd \ + {{/content.type=application/vnd.agl.service}}\ {{^content.type=application/vnd.agl.service}}\ --port={{:#metadata.http-port}} \ --random-token \ @@ -165,8 +175,6 @@ ExecStart=/usr/bin/afb-daemon \ --roothttp=htdocs \ {{/required-permission.urn:AGL:permission::public:no-htdocs}}\ {{/content.type=application/vnd.agl.service}}\ - --rootdir={{:#metadata.install-dir}} \ - --workdir={{&#metadata.app-data-dir}}/{{id}} \ {{#required-permission.urn:AGL:permission::public:applications:read}}\ --alias=/icons:{{:#metadata.icons-dir}} \ {{/required-permission.urn:AGL:permission::public:applications:read}}\ @@ -206,9 +214,6 @@ ExecStart=/usr/bin/afb-daemon \ --dbus-server={{name}} \ {{/value=dbus}}\ {{/provided-api}}\ - {{#content.type=application/vnd.agl.service}}\ - --no-httpd \ - {{/content.type=application/vnd.agl.service}}\ {{#content.type=text/html}}\ --exec /usr/bin/web-runtime http://localhost:@p/{{content.src}}?token=@t {{/content.type=text/html}}\ |