X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Fafm-unit.conf.in;h=3190b0e975aa5c055e88cc9a4300d2e3989efc24;hb=83ac3d4fd8039d114336e67e8a65a2b701814485;hp=bcd99492ea4976e099b134f1e5079518d3d93239;hpb=ad8b7c3ad94dd464175e26080e4152bff408d6da;p=src%2Fapp-framework-main.git

diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in
index bcd9949..3190b0e 100644
--- a/conf/afm-unit.conf.in
+++ b/conf/afm-unit.conf.in
@@ -113,6 +113,8 @@ BindsTo=afm-api-ws-{{name}}.socket
 After=afm-api-ws-{{name}}.socket
 {{/value=auto|ws}}
 {{/required-api}}
+Requires=user-config.service
+After=user-config.service
 %nl
 
 [Service]
@@ -144,6 +146,10 @@ Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}
 
 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    ----
@@ -155,18 +161,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}}\
@@ -211,10 +221,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}}