Rename 'link_to_testsuite' directory to 'software' directory

slapos/recipe/erp5testnode/__init__.py

@@ -97,7 +97,7 @@ class Recipe(GenericBaseRecipe):
         certificate=self.options['httpd-cert-file'],
         key=self.options['httpd-key-file'],
         testnode_log_directory=self.options['log-directory'],
-        testnode_link_to_testsuite_directory=self.options['link-to-testsuite-directory'],
+        testnode_software_directory=self.options['software-directory'],
     )
     config_file = self.createFile(self.options['httpd-conf-file'],
        self.substituteTemplate(self.getTemplateFilename('httpd.conf.in'),

slapos/recipe/erp5testnode/template/erp5testnode.cfg.in

@@ -2,7 +2,7 @@
 slapos_directory = %(slapos_directory)s
 working_directory = %(working_directory)s
 test_suite_directory = %(test_suite_directory)s
-link_to_testsuite_directory = %(link_to_testsuite_directory)s
+software_directory = %(software_directory)s
 log_directory = %(log_directory)s
 run_directory = %(run_directory)s
 srv_directory = %(srv_directory)s

slapos/recipe/erp5testnode/template/httpd.conf.in

@@ -77,7 +77,7 @@ Listen [%(ip)s]:%(port2)s
 <VirtualHost *:%(port2)s>
     SSLEngine on
     RewriteRule (.*) http://[%(ip)s]:%(port2)s/VirtualHostBase/https/[%(ip)s]:%(port2)s/VirtualHostRoot/$1 [L,P]
-    DocumentRoot "%(testnode_link_to_testsuite_directory)s"
+    DocumentRoot "%(testnode_software_directory)s"
     <Directory />
         Options FollowSymLinks
         IndexOptions FancyIndexing

software/erp5testnode/instance-default.cfg

@@ -33,7 +33,7 @@ proxy-host = $${slap-network-information:global-ipv6}
 proxy-port = 5000
 log-directory = $${directory:log}
 srv-directory = $${rootdirectory:srv}
-link-to-testsuite-directory = $${directory:link-to-testsuite}
+software-directory = $${directory:software}
 run-directory = $${directory:run}
 test-node-title = $${slap-parameter:test-node-title}
 node-quantity = $${slap-parameter:node-quantity}
@@ -56,7 +56,7 @@ httpd-port = 9080
 httpd-port2 = 9081
 httpd-ip = $${slap-network-information:global-ipv6}
 httpd-log-directory = $${basedirectory:log}
-httpd-link-to-testsuite-directory = $${directory:link-to-testsuite}
+httpd-software-directory = $${directory:software}
 httpd-cert-file = $${rootdirectory:etc}/httpd-public.crt
 httpd-key-file = $${rootdirectory:etc}/httpd-private.key
 
@@ -156,7 +156,7 @@ testnode = $${rootdirectory:srv}/testnode
 test-suite = $${rootdirectory:srv}/test_suite
 log = $${basedirectory:log}/testnode
 run = $${basedirectory:run}/testnode
-link-to-testsuite = $${rootdirectory:srv}/link_to_testsuite 
+software = $${rootdirectory:srv}/software
 shellinabox = $${rootdirectory:srv}/shellinabox
 ca-dir = $${rootdirectory:srv}/ca
 

software/erp5testnode/software.cfg

@@ -94,7 +94,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-default.cfg
 output = ${buildout:directory}/template-default.cfg
 mode = 0644
-md5sum = 0fd773a78306cab8909a111461c420d1
+md5sum = b2a25e0ff67ec60f0d2b567313b096c8
 
 [networkcache]
 # signature certificates of the following uploaders.