wgtpkg-unit: add management of wanted-by in unit descriptions

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

diff --git a/conf/afm-unit.conf b/conf/afm-unit.conf
index 2dfa2f6..86ab626 100644 (file)
--- a/conf/afm-unit.conf
+++ b/conf/afm-unit.conf
@@ -45,6 +45,10 @@
 ;
 ;             gives the name and type of the unit
 ;
+;     - %systemd-unit wanted-by NAME
+;
+;             tells to install a link to unit in the wants of NAME
+;
 ;---------------------------------------------------------------------------------
 {{#targets}}
 %begin systemd-unit
@@ -77,6 +81,7 @@ After=afm-api-{{name}}
 
 [Service]
 SmackProcessLabel=User::App::{{id}}
+SuccessExitStatus=0 SIGKILL
 
 {{#required-permission}}
   {{#urn:AGL:permission::platform:no-oom}}      OOMScoreAdjust=-500             {{/urn:AGL:permission::platform:no-oom}}
@@ -84,11 +89,12 @@ SmackProcessLabel=User::App::{{id}}
   {{^urn:AGL:permission::partner:real-time}}    RestrictRealtime=on             {{/urn:AGL:permission::partner:real-time}}
   {{#urn:AGL:permission::public:display}}       SupplementaryGroups=display     {{/urn:AGL:permission::public:display}}
   {{^urn:AGL:permission::public:syscall:clock}} SystemCallFilter=~@clock        {{/urn:AGL:permission::public:syscall:clock}}
-  {{^urn:AGL:permission::public:internet}}      RestrictAddressFamilies=AF_UNIX {{/urn:AGL:permission::public:internet}}
 {{/required-permission}}
 %nl
 
 WorkingDirectory={{&#metadata.app-data-dir}}
+Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}}
+
 
 ;---------------------------------------------------------------------------------
 {{#content.type=text/html}}
@@ -99,8 +105,13 @@ WorkingDirectory={{&#metadata.app-data-dir}}
 
 ExecStart=/usr/bin/afb-daemon --port={{:#metadata.http-port}} --random-token \
        --rootdir={{:#metadata.install-dir}} \
-       --workdir={{&#metadata.app-data-dir}} \
-       --roothttp=htdocs \
+       --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}}\
@@ -125,22 +136,33 @@ ExecStart=/usr/bin/afb-daemon --port={{:#metadata.http-port}} --random-token \
 
 {{/content.type=text/html}}
 
+;---------------------------------------------------------------------------------
+{{#content.type=application/x-executable}}
+
+%systemd-unit user
+%systemd-unit service afm-appli-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
+Environment=LD_LIBRARY_PATH=$ORIGIN/$LIB
+
+ExecStart={{:#metadata.install-dir}}/{{content.src}}
+
+{{/content.type=application/x-executable}}
+
 ;---------------------------------------------------------------------------------
 {{#content.type=application/vnd.agl.service}}
 
 %systemd-unit user
-%systemd-unit service afm-api-{{:#target}}
+%systemd-unit service afm-service-{{:#target}}
 
 ExecStart=/usr/bin/afb-daemon \
        --rootdir={{:#metadata.install-dir}} \
-       --workdir={{&#metadata.install-dir}} \
+       --workdir={{&#metadata.install-dir}}/{{id}} \
        {{^required-permission.urn:AGL:permission::partner:service:no-ws}}\
-               --ws-server=unix:%t/bindings/{{:#target}} \
+               --ws-server=sd:{{:#target}} \
        {{/required-permission.urn:AGL:permission::partner:service:no-ws}}\
        {{^required-permission.urn:AGL:permission::partner:service:no-dbus}}\
                --dbus-server={{:#target}} \
        {{/required-permission.urn:AGL:permission::partner:service:no-dbus}}\
-       --no-httpd 
+       --no-httpd
 
 {{^required-permission.urn:AGL:permission::partner:service:no-ws}}
 
@@ -150,12 +172,12 @@ ExecStart=/usr/bin/afb-daemon \
 # auto generated by wgtpkg-unit for {{id}} version {{version}} target {{:#target}}
 #
 %systemd-unit user
-%systemd-unit socket afm-api-{{:#target}}
-
+%systemd-unit socket afm-service-{{:#target}}
 
 [socket]
 SmackLabel=*
 ListenStream=%t/bindings/{{:#target}}
+FileDescriptorName={{:#target}}
 
 {{/required-permission.urn:AGL:permission::partner:service:no-ws}}
 
@@ -165,9 +187,9 @@ ListenStream=%t/bindings/{{:#target}}
 {{#required-permission.urn:AGL:permission::system:run-by-default}}
 [install]
 WantedBy=default.target
+%systemd-unit wanted-by default.target
 {{/required-permission.urn:AGL:permission::system:run-by-default}}
 ;---------------------------------------------------------------------------------
 %end systemd-unit
 {{/targets}}
 
-