X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Fafm-unit.conf;h=18ade850b6e6ddcc264edd85071b08ee9e3b7a7e;hb=366f2093c78347dbee190eff929052a969724076;hp=290c3e180e0f8fe77a3436969871a7543067717b;hpb=1d4de11a907e41c06063a2cd5028dc4101690f50;p=src%2Fapp-framework-main.git

diff --git a/conf/afm-unit.conf b/conf/afm-unit.conf
index 290c3e1..18ade85 100644
--- a/conf/afm-unit.conf
+++ b/conf/afm-unit.conf
@@ -68,15 +68,16 @@ X-AGL-HTTP-port={{:#metadata.http-port}}
 ConditionSecurity=smack
 %nl
 
-# Automatic bound to required bindings
-{{#required-binding}}
+# Automatic bound to required api
+{{#required-api}}
 BindsTo=afm-api-{{name}}
 After=afm-api-{{name}}
-{{/required-binding}}
+{{/required-api}}
 %nl
 
 [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 +85,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,12 +101,17 @@ 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}}\
-	{{#required-binding}}\
+	{{#required-api}}\
 		{{#value=auto}}\
 			--ws-client=unix:%t/apis/ws/{{name}} \
 		{{/value=auto}}\
@@ -120,11 +127,22 @@ ExecStart=/usr/bin/afb-daemon --port={{:#metadata.http-port}} --random-token \
 		{{#value=cloud}}\
 			--cloud-client={{name}} \
 		{{/value=cloud}}\
-	{{/required-binding}}\
+	{{/required-api}}\
 	--exec /usr/bin/web-runtime http://localhost:@p/{{content.src}}?token=@t
 
 {{/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}}
 
@@ -133,14 +151,14 @@ ExecStart=/usr/bin/afb-daemon --port={{:#metadata.http-port}} --random-token \
 
 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}}
 
@@ -156,13 +174,18 @@ ExecStart=/usr/bin/afb-daemon \
 [socket]
 SmackLabel=*
 ListenStream=%t/bindings/{{:#target}}
+FileDescriptorName={{:#target}}
 
 {{/required-permission.urn:AGL:permission::partner:service:no-ws}}
 
 {{/content.type=application/vnd.agl.service}}
 
+;---------------------------------------------------------------------------------
+{{#required-permission.urn:AGL:permission::system:run-by-default}}
+[install]
+WantedBy=default.target
+{{/required-permission.urn:AGL:permission::system:run-by-default}}
 ;---------------------------------------------------------------------------------
 %end systemd-unit
 {{/targets}}
 
-