Rename port2 -> software_acces_port

slapos/recipe/erp5testnode/__init__.py

@@ -88,7 +88,7 @@ class Recipe(GenericBaseRecipe):
         lock_file=self.options['httpd-lock-file'],
         ip=self.options['httpd-ip'],
         port=self.options['httpd-port'],
-        port2=self.options['httpd-port2'],
+        software_access_port=self.options['httpd-software-access-port'],
         testnode_srv_directory=self.options['srv-directory'],
         error_log=os.path.join(self.options['httpd-log-directory'],
                                'httpd-error.log'),

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

@@ -15,7 +15,7 @@ ipv6_address = %(ipv6_address)s
 test_suite_master_url = %(test_suite_master_url)s
 httpd_ip = %(httpd_ip)s
 httpd_port = %(httpd_port)s
-httpd_port2 = %(httpd_port2)s
+httpd_software_access_port = %(httpd_software_access_port)s
 computer_id = %(computer_id)s
 server_url = %(server_url)s
 

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

@@ -73,10 +73,10 @@ SSLProxyEngine On
     </Directory>
 </VirtualHost>
 
-Listen [%(ip)s]:%(port2)s
-<VirtualHost *:%(port2)s>
+Listen [%(ip)s]:%(software_access_port)s
+<VirtualHost *:%(software_access_port)s>
     SSLEngine on
-    RewriteRule (.*) http://[%(ip)s]:%(port2)s/VirtualHostBase/https/[%(ip)s]:%(port2)s/VirtualHostRoot/$1 [L,P]
+    RewriteRule (.*) http://[%(ip)s]:%(software_access_port)s/VirtualHostBase/https/[%(ip)s]:%(software_access_port)s/VirtualHostRoot/$1 [L,P]
     DocumentRoot "%(testnode_software_directory)s"
     <Directory />
         Options FollowSymLinks

software/erp5testnode/instance-default.cfg

@@ -53,7 +53,7 @@ httpd-lock-file = $${basedirectory:run}/httpd.lock
 httpd-conf-file = $${rootdirectory:etc}/httpd.conf
 httpd-wrapper = $${rootdirectory:bin}/httpd
 httpd-port = 9080
-httpd-port2 = 9081
+httpd-software-access-port = 9081
 httpd-ip = $${slap-network-information:global-ipv6}
 httpd-log-directory = $${basedirectory:log}
 httpd-software-directory = $${directory:software}

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 = b2a25e0ff67ec60f0d2b567313b096c8
+md5sum = 9858181c89a361ef93ede0eac8d56034
 
 [networkcache]
 # signature certificates of the following uploaders.