software/theia: Move instance and software location to match webrunner

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = 799d7468cacaf6d9c9b42f828a8a9ddb
+md5sum = 1c60191f8724854f979a17d2624e65d8
 
 [yarn.lock]
 filename = yarn.lock

software/theia/instance.cfg.in

@@ -286,7 +286,7 @@ command =
 ipv4 = $${instance-parameter:ipv4-random}
 ipv6 = $${instance-parameter:ipv6-random}
 port = 4000
-slapos-configuration = $${directory:slapos}/etc/slapos.cfg
+slapos-configuration = $${directory:runner}/etc/slapos.cfg
 computer-id = slaprunner
 
 [slapos-standalone-activate]
@@ -308,7 +308,7 @@ template =
   inline:#!/bin/sh
   export PATH=${buildout:bin-directory}:$PATH
   exec ${slapos-standalone:script-path} \
-      $${directory:slapos} \
+      $${directory:runner} \
       $${slapos-standalone-config:ipv4} \
       $${slapos-standalone-config:ipv6} \
       $${slapos-standalone-config:port} \
@@ -403,8 +403,8 @@ dot-theia = $${buildout:directory}/.theia/
 pidfiles = $${:var}/run
 
 services = $${:etc}/service
+runner = $${:srv}/runner
 project = $${:srv}/project
-slapos = $${:srv}/slapos
 frontend-static = $${:srv}/frontend-static
 frontend-static-public = $${:frontend-static}/public
 frontend-static-css = $${:frontend-static}/css

software/theia/software.cfg

@@ -97,6 +97,8 @@ initialization =
       args.server_port,
       computer_id=args.computer_id,
       shared_part_list=shared_part_list,
+      software_root="%s/software" % args.base_directory,
+      instance_root="%s/instance" % args.base_directory,
       partition_forward_configuration=partition_forward_configuration,
   )
   standalone.start()