X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Funit%2Fafm-unit-debug.conf.in;h=582e7230385ba1b901adb2275e38f0752f8e4bb2;hb=94176d9f5f1a5d9b1f298000c2868ebab148d805;hp=accf8ca245f2c51c0b56ee35e63bb83b40cec177;hpb=f03138790d27b2ce28e6db5756b553e0115321f0;p=src%2Fapp-framework-main.git diff --git a/conf/unit/afm-unit-debug.conf.in b/conf/unit/afm-unit-debug.conf.in index accf8ca..582e723 100644 --- a/conf/unit/afm-unit-debug.conf.in +++ b/conf/unit/afm-unit-debug.conf.in @@ -107,6 +107,7 @@ X-AFM--workdir=/home/%i/app-data/{{:id}} %nl Requires=afm-user-session@%i.target After=user@%i.service +After=Network.target # Adds check to smack ConditionSecurity=smack %nl @@ -145,7 +146,10 @@ Slice=user-%i.slice %nl WorkingDirectory=-/home/%i/app-data/{{:id}} ExecStartPre=/bin/mkdir -p /home/%i/app-data/{{:id}} +Environment=AFM_ID={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}} +Environment=AFM_WORKDIR=/home/%i/app-data/{{:id}} +Environment=AFM_WSAPI_DIR=@afm_users_rundir@/%i/apis/ws Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}/bin Environment=LD_LIBRARY_PATH={{:#metadata.install-dir}}/lib Environment=XDG_DATA_HOME=/home/%i/app-data/{{:id}} @@ -154,7 +158,6 @@ Environment=XDG_CACHE_HOME=/home/%i/app-data/{{:id}} Environment=XDG_RUNTIME_DIR=@afm_users_rundir@/%i Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=@afm_users_rundir@/%i/bus ; Needed to enable debug -Environment=AFM_ID={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} EnvironmentFile=-@afm_platform_rundir@/debug/{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}.env SyslogIdentifier=afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} StandardInput=null @@ -182,6 +185,7 @@ ExecStart=/usr/bin/afb-daemon \ {{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \ {{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \ {{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \ + {{#value=tcp}}--ws-client=tcp:{{name}}{{/value=tcp}} \ {{/required-api}} \ {{#required-binding}} \ {{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \ @@ -190,6 +194,7 @@ ExecStart=/usr/bin/afb-daemon \ {{#provided-api}} \ {{#value=auto|ws}}--ws-server=sd:{{name}}{{/value=auto|ws}} \ {{#value=dbus}}--dbus-server={{name}}{{/value=dbus}} \ + {{#value=tcp}}--ws-server=tcp:{{name}}{{/value=tcp}} \ {{/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}} @@ -213,6 +218,7 @@ WantedBy=afm-user-session@.target ;---- P R O V I D E D A P I S ---- ;------------------------------------------------------------------------------- {{#provided-api}} +{{#value=ws|auto}} ;------------------------------------------------------------------------------- ;---- T H E S E R V I C E O F T H E A P I ---- ;------------------------------------------------------------------------------- @@ -239,7 +245,6 @@ ExecStart=/bin/true ;------------------------------------------------------------------------------- ;---- T H E S O C K E T O F T H E A P I ---- ;------------------------------------------------------------------------------- -{{#value=ws|auto}} %begin systemd-unit # auto generated by wgtpkg-unit for {{:id}} version {{:version}} target {{:#target}} of {{:idaver}} %systemd-unit system