X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Fafm-unit.conf.in;h=237f8ce00473beecd99aab93c527b12ac086d25f;hb=67f9fa1121b6f9721143f85c1f7b8aa9a579e470;hp=7f35a58b39d3aaf66638e15e828513cfc3ce7bcb;hpb=0ee18c0280f67ef458a450c6da408859b8a6734f;p=src%2Fapp-framework-main.git

diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in
index 7f35a58..237f8ce 100644
--- a/conf/afm-unit.conf.in
+++ b/conf/afm-unit.conf.in
@@ -13,7 +13,7 @@
 ;
 ;           Lines beginning with ; are firstly removed
 ;
-;    2. File instanciation
+;    2. File instantiation
 ;
 ;           Mustache (extended) substitutions are applied using JSON
 ;           data deduced from config.xml file of the widget.
@@ -62,7 +62,7 @@
 ;
 ;        X-AFM-description={{description}}
 ;
-;              Records the descritpion of the unit in the field "description"
+;              Records the description of the unit in the field "description"
 ;              of both the public and private object describing the unit.
 ;
 ;        X-AFM--wgtdir={{:#metadata.install-dir}}
@@ -109,8 +109,8 @@ ConditionSecurity=smack
 # Automatic bound to required api
 {{#required-api}}
 {{#value=auto|ws}}
-BindsTo=afm-api-ws-{{name}}
-After=afm-api-ws-{{name}}
+BindsTo=afm-api-ws-{{name}}.socket
+After=afm-api-ws-{{name}}.socket
 {{/value=auto|ws}}
 {{/required-api}}
 %nl
@@ -132,6 +132,7 @@ SuccessExitStatus=0 SIGKILL
 WorkingDirectory=-{{&#metadata.app-data-dir}}/{{id}}
 ExecStartPre=/bin/mkdir -p {{&#metadata.app-data-dir}}/{{id}}
 Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}}
+Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}
 
 %systemd-unit user
 {{#required-permission.urn:AGL:permission::public:hidden}}\
@@ -141,6 +142,12 @@ Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}}
 %systemd-unit service afm-appli-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
 {{/required-permission.urn:AGL:permission::public:hidden}}\
 
+Environment=LD_LIBRARY_PATH=$ORIGIN/lib
+
+SyslogIdentifier=afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
+StandardInput=null
+StandardOutput=journal
+StandardError=journal
 
 ;---------------------------------------------------------------------------------
 ;----   text/html  application/vnd.agl.native  application/vnd.agl.service    ----
@@ -152,18 +159,22 @@ X-AFM--http-port={{:#metadata.http-port}}
 {{/content.type=application/vnd.agl.service}}
 
 ExecStart=/usr/bin/afb-daemon \
+	--name afbd-{{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 \
+		{{#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}}\
@@ -208,10 +219,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}}
 
@@ -221,8 +229,6 @@ ExecStart=/usr/bin/afb-daemon \
 ;---------------------------------------------------------------------------------
 {{#content.type=application/x-executable}}
 
-Environment=LD_LIBRARY_PATH=$ORIGIN/$LIB
-
 ExecStart={{:#metadata.install-dir}}/{{content.src}}
 
 {{/content.type=application/x-executable}}