afn-unit.conf: Fix bug for option --no-httpd

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 <jose.bollo@iot.bzh>

diff --git a/conf/afm-unit-debug.conf.in b/conf/afm-unit-debug.conf.in
index 6fbd229..97b0c9e 100644 (file)
--- 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}}
 

diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in
index bcd9949..8eb9433 100644 (file)
--- 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}}