X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Fafm-unit.conf;h=671242467e60677d28491cfd25e4546d47a0c5b6;hb=255c83029f56e8d90e7ce185b007c4ca65afec1e;hp=4cbfc8738e03168867289f2b90d6e5e5c36ee42e;hpb=550ca0ae2bb9138c85fda941b67d4db1da1609ed;p=src%2Fapp-framework-main.git diff --git a/conf/afm-unit.conf b/conf/afm-unit.conf index 4cbfc87..6712424 100644 --- a/conf/afm-unit.conf +++ b/conf/afm-unit.conf @@ -24,7 +24,7 @@ ; ; Directives: ; -; All directive occopy one whole line starting with % +; Any directive occupy one whole line starting with % ; ; - %nl ; @@ -72,9 +72,13 @@ ; ;--------------------------------------------------------------------------------- {{#targets}} + +;--------------------------------------------------------------------------------- +;---- P R O V I D E D U N I T S ---- +;--------------------------------------------------------------------------------- %begin systemd-unit -# auto generated by wgtpkg-unit for {{id}} version {{version}} target {{:#target}} +# auto generated by wgtpkg-unit for {{id}} version {{version}} target {{:#target}} of {{idaver}} %nl [Unit] @@ -82,7 +86,7 @@ Description={{description}} X-AFM-description={{description}} X-AFM-name={{name.content}} X-AFM-shortname={{name.short}} -X-AFM-id={{idaver}} +X-AFM-id={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} X-AFM-version={{version}} X-AFM-author={{author.content}} X-AFM-author-email={{author.email}} @@ -102,8 +106,10 @@ ConditionSecurity=smack # Automatic bound to required api {{#required-api}} -BindsTo=afm-api-{{name}} -After=afm-api-{{name}} +{{#value=auto|ws}} +BindsTo=afm-api-ws-{{name}} +After=afm-api-ws-{{name}} +{{/value=auto|ws}} {{/required-api}} %nl @@ -114,7 +120,7 @@ SuccessExitStatus=0 SIGKILL {{#required-permission}} {{#urn:AGL:permission::platform:no-oom}} OOMScoreAdjust=-500 {{/urn:AGL:permission::platform:no-oom}} {{#urn:AGL:permission::partner:real-time}} IOSchedulingClass=realtime {{/urn:AGL:permission::partner:real-time}} - {{^urn:AGL:permission::partner:real-time}} RestrictRealtime=on {{/urn:AGL:permission::partner:real-time}} +# {{^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}} {{/required-permission}} @@ -124,16 +130,28 @@ WorkingDirectory=-{{&#metadata.app-data-dir}}/{{id}} ExecStartPre=/bin/mkdir -p {{&#metadata.app-data-dir}}/{{id}} Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}} - -;--------------------------------------------------------------------------------- -{{#content.type=text/html}} - %systemd-unit user - +{{#required-permission.urn:AGL:permission::public:hidden}}\ +%systemd-unit service afm-service-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} +{{/required-permission.urn:AGL:permission::public:hidden}}\ +{{^required-permission.urn:AGL:permission::public:hidden}}\ %systemd-unit service afm-appli-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} +{{/required-permission.urn:AGL:permission::public:hidden}}\ + +;--------------------------------------------------------------------------------- +;---- text/html application/vnd.agl.native application/vnd.agl.service ---- +;--------------------------------------------------------------------------------- +{{#content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}} +{{^content.type=application/vnd.agl.service}} X-AFM--http-port={{:#metadata.http-port}} -ExecStart=/usr/bin/afb-daemon --port={{:#metadata.http-port}} --random-token \ +{{/content.type=application/vnd.agl.service}} + +ExecStart=/usr/bin/afb-daemon \ + {{^content.type=application/vnd.agl.service}}\ + --port={{:#metadata.http-port}} \ + --random-token \ + {{/content.type=application/vnd.agl.service}}\ --rootdir={{:#metadata.install-dir}} \ --workdir={{&#metadata.app-data-dir}}/{{id}} \ {{#required-permission.urn:AGL:permission::public:no-htdocs}}\ @@ -161,17 +179,44 @@ ExecStart=/usr/bin/afb-daemon --port={{:#metadata.http-port}} --random-token \ {{#value=cloud}}\ --cloud-client={{name}} \ {{/value=cloud}}\ + {{#value=local}}\ + --binding={{:#metadata.install-dir}}/{{name}} \ + {{/value=local}}\ {{/required-api}}\ - --exec /usr/bin/web-runtime http://localhost:@p/{{content.src}}?token=@t + {{#provided-api}}\ + {{#value=auto}}\ + {{^required-permission.urn:AGL:permission::partner:service:no-ws}}\ + --ws-server=sd:{{name}} \ + {{/required-permission.urn:AGL:permission::partner:service:no-ws}}\ + {{^required-permission.urn:AGL:permission::partner:service:no-dbus}}\ + --dbus-server={{name}} \ + {{/required-permission.urn:AGL:permission::partner:service:no-dbus}}\ + {{/value=auto}}\ + {{#value=ws}}\ + --ws-server=sd:{{name}} \ + {{/value=ws}}\ + {{#value=dbus}}\ + --dbus-server={{name}} \ + {{/value=dbus}}\ + {{/provided-api}}\ + {{#content.type=text/html}}\ + --exec /usr/bin/web-runtime http://localhost:@p/{{content.src}}?token=@t + {{/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=text/html|application/vnd.agl.native|application/vnd.agl.service}} -{{/content.type=text/html}} +;--------------------------------------------------------------------------------- +;---- application/x-executable ---- ;--------------------------------------------------------------------------------- {{#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}} @@ -179,48 +224,59 @@ ExecStart={{:#metadata.install-dir}}/{{content.src}} {{/content.type=application/x-executable}} ;--------------------------------------------------------------------------------- -{{#content.type=application/vnd.agl.service}} +; auto start +;--------------------------------------------------------------------------------- +{{#required-permission.urn:AGL:permission::system:run-by-default}} +{{^provided-api}} +%nl +[Install] +WantedBy=default.target +%systemd-unit wanted-by default.target +{{/provided-api}} +{{/required-permission.urn:AGL:permission::system:run-by-default}} -%systemd-unit user -%systemd-unit service afm-service-{{:#target}} +%end systemd-unit -ExecStart=/usr/bin/afb-daemon \ - --rootdir={{:#metadata.install-dir}} \ - --workdir={{&#metadata.install-dir}}/{{id}} \ - {{^required-permission.urn:AGL:permission::partner:service:no-ws}}\ - --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 -{{^required-permission.urn:AGL:permission::partner:service:no-ws}} +;--------------------------------------------------------------------------------- +;---- P R O V I D E D A P I S ---- +;--------------------------------------------------------------------------------- + +{{#provided-api}} +{{#value=ws|auto}} -%end systemd-unit %begin systemd-unit -# auto generated by wgtpkg-unit for {{id}} version {{version}} target {{:#target}} +# auto generated by wgtpkg-unit for {{id}} version {{version}} target {{:#target}} of {{idaver}} # %systemd-unit user -%systemd-unit socket afm-service-{{:#target}} +%systemd-unit socket afm-api-ws-{{name}} [Socket] SmackLabel=* -ListenStream=%t/bindings/{{:#target}} -FileDescriptorName={{:#target}} +ListenStream=%t/bindings/{{name}} +FileDescriptorName={{name}} -{{/required-permission.urn:AGL:permission::partner:service:no-ws}} - -{{/content.type=application/vnd.agl.service}} +{{#required-permission.urn:AGL:permission::public:hidden}}\ +Service=afm-service-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} +{{/required-permission.urn:AGL:permission::public:hidden}}\ +{{^required-permission.urn:AGL:permission::public:hidden}}\ +Service=afm-appli-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} +{{/required-permission.urn:AGL:permission::public:hidden}}\ ;--------------------------------------------------------------------------------- {{#required-permission.urn:AGL:permission::system:run-by-default}} +%nl [Install] WantedBy=default.target %systemd-unit wanted-by default.target {{/required-permission.urn:AGL:permission::system:run-by-default}} ;--------------------------------------------------------------------------------- + %end systemd-unit + +{{/value=ws|auto}} +{{/provided-api}} + {{/targets}}