From 10ca2afd9ef6413d5a2ada35b1d3a12c2cf96df1 Mon Sep 17 00:00:00 2001 From: José Bollo Date: Tue, 29 Aug 2017 08:49:57 +0200 Subject: afn-unit.conf: Fix bug for option --no-httpd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The option --no-httpd is applied for applications of type 'application/vnd.agl.service' but the option was misplaced in the command line. On an other hand, setting --no-httpd makes option --roothttp irrevelant. Also, the option is currently not to be applied when AGL_DEVEL (pulling afm-unit-debug.in) is required. Change-Id: I05b15fa2a847a5564d7c88ce7ac47cd8a2a29f40 Signed-off-by: José Bollo --- conf/afm-unit-debug.conf.in | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'conf/afm-unit-debug.conf.in') diff --git a/conf/afm-unit-debug.conf.in b/conf/afm-unit-debug.conf.in index 6fbd229..97b0c9e 100644 --- a/conf/afm-unit-debug.conf.in +++ b/conf/afm-unit-debug.conf.in @@ -154,23 +154,24 @@ Environment=LD_LIBRARY_PATH=$ORIGIN/lib ;--------------------------------------------------------------------------------- {{#content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}} -{{^content.type=application/vnd.agl.service}} X-AFM--http-port={{:#metadata.http-port}} -{{/content.type=application/vnd.agl.service}} ExecStart=/usr/bin/afb-daemon \ - {{^content.type=application/vnd.agl.service}}\ - --port={{:#metadata.http-port}} \ - --random-token \ - {{/content.type=application/vnd.agl.service}}\ + --port={{:#metadata.http-port}} \ + --random-token \ --rootdir={{:#metadata.install-dir}} \ --workdir={{&#metadata.app-data-dir}}/{{id}} \ - {{#required-permission.urn:AGL:permission::public:no-htdocs}}\ + {{#content.type=application/vnd.agl.service}} \ --roothttp=. \ - {{/required-permission.urn:AGL:permission::public:no-htdocs}}\ - {{^required-permission.urn:AGL:permission::public:no-htdocs}}\ - --roothttp=htdocs \ - {{/required-permission.urn:AGL:permission::public:no-htdocs}}\ + {{/content.type=application/vnd.agl.service}} \ + {{^content.type=application/vnd.agl.service}} \ + {{#required-permission.urn:AGL:permission::public:no-htdocs}}\ + --roothttp=. \ + {{/required-permission.urn:AGL:permission::public:no-htdocs}}\ + {{^required-permission.urn:AGL:permission::public:no-htdocs}}\ + --roothttp=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}}\ @@ -215,10 +216,7 @@ ExecStart=/usr/bin/afb-daemon \ {{/content.type=text/html}}\ {{#content.type=application/vnd.agl.native}}\ --exec {{:#metadata.install-dir}}/{{content.src}} @p @t - {{/content.type=application/vnd.agl.native}}\ - {{#content.type=application/vnd.agl.service}}\ - --no-httpd - {{/content.type=application/vnd.agl.service}} + {{/content.type=application/vnd.agl.native}} {{/content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}} -- cgit 1.2.3-korg