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.conf.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'conf/afm-unit.conf.in') diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in index bcd9949..8eb9433 100644 --- a/conf/afm-unit.conf.in +++ b/conf/afm-unit.conf.in @@ -158,15 +158,15 @@ ExecStart=/usr/bin/afb-daemon \ {{^content.type=application/vnd.agl.service}}\ --port={{:#metadata.http-port}} \ --random-token \ + {{#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}}\ --rootdir={{:#metadata.install-dir}} \ --workdir={{&#metadata.app-data-dir}}/{{id}} \ - {{#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}}\ {{#required-permission.urn:AGL:permission::public:applications:read}}\ --alias=/icons:{{:#metadata.icons-dir}} \ {{/required-permission.urn:AGL:permission::public:applications:read}}\ @@ -206,15 +206,15 @@ 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}}\ {{#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