unit.conf: Explicit dependency to user-config.service

[src/app-framework-main.git] / conf / afm-unit.conf.in

diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in
index e6163e2..3190b0e 100644 (file)
--- 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]
@@ -142,6 +144,12 @@ Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#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    ----
@@ -153,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}}\
@@ -209,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}}
 
@@ -222,8 +231,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}}