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 1b6f062..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]
@@ -144,7 +146,7 @@ Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}
 
 Environment=LD_LIBRARY_PATH=$ORIGIN/lib
 
-SyslogIdentifier={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
+SyslogIdentifier=afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
 StandardInput=null
 StandardOutput=journal
 StandardError=journal
@@ -159,7 +161,7 @@ X-AFM--http-port={{:#metadata.http-port}}
 {{/content.type=application/vnd.agl.service}}
 
 ExecStart=/usr/bin/afb-daemon \
-       --name {{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} \
+       --name afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} \
        --rootdir={{:#metadata.install-dir}} \
        --workdir={{&#metadata.app-data-dir}}/{{id}} \
        {{#content.type=application/vnd.agl.service}}\