Commit c3049cfd authored by Benjamin Blanc's avatar Benjamin Blanc

Rename port2 -> software_acces_port

parent 1083e32b
...@@ -88,7 +88,7 @@ class Recipe(GenericBaseRecipe): ...@@ -88,7 +88,7 @@ class Recipe(GenericBaseRecipe):
lock_file=self.options['httpd-lock-file'], lock_file=self.options['httpd-lock-file'],
ip=self.options['httpd-ip'], ip=self.options['httpd-ip'],
port=self.options['httpd-port'], 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'], testnode_srv_directory=self.options['srv-directory'],
error_log=os.path.join(self.options['httpd-log-directory'], error_log=os.path.join(self.options['httpd-log-directory'],
'httpd-error.log'), 'httpd-error.log'),
......
...@@ -15,7 +15,7 @@ ipv6_address = %(ipv6_address)s ...@@ -15,7 +15,7 @@ ipv6_address = %(ipv6_address)s
test_suite_master_url = %(test_suite_master_url)s test_suite_master_url = %(test_suite_master_url)s
httpd_ip = %(httpd_ip)s httpd_ip = %(httpd_ip)s
httpd_port = %(httpd_port)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 computer_id = %(computer_id)s
server_url = %(server_url)s server_url = %(server_url)s
......
...@@ -73,10 +73,10 @@ SSLProxyEngine On ...@@ -73,10 +73,10 @@ SSLProxyEngine On
</Directory> </Directory>
</VirtualHost> </VirtualHost>
Listen [%(ip)s]:%(port2)s Listen [%(ip)s]:%(software_access_port)s
<VirtualHost *:%(port2)s> <VirtualHost *:%(software_access_port)s>
SSLEngine on 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" DocumentRoot "%(testnode_software_directory)s"
<Directory /> <Directory />
Options FollowSymLinks Options FollowSymLinks
......
...@@ -53,7 +53,7 @@ httpd-lock-file = $${basedirectory:run}/httpd.lock ...@@ -53,7 +53,7 @@ httpd-lock-file = $${basedirectory:run}/httpd.lock
httpd-conf-file = $${rootdirectory:etc}/httpd.conf httpd-conf-file = $${rootdirectory:etc}/httpd.conf
httpd-wrapper = $${rootdirectory:bin}/httpd httpd-wrapper = $${rootdirectory:bin}/httpd
httpd-port = 9080 httpd-port = 9080
httpd-port2 = 9081 httpd-software-access-port = 9081
httpd-ip = $${slap-network-information:global-ipv6} httpd-ip = $${slap-network-information:global-ipv6}
httpd-log-directory = $${basedirectory:log} httpd-log-directory = $${basedirectory:log}
httpd-software-directory = $${directory:software} httpd-software-directory = $${directory:software}
......
...@@ -94,7 +94,7 @@ recipe = slapos.recipe.template ...@@ -94,7 +94,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-default.cfg url = ${:_profile_base_location_}/instance-default.cfg
output = ${buildout:directory}/template-default.cfg output = ${buildout:directory}/template-default.cfg
mode = 0644 mode = 0644
md5sum = b2a25e0ff67ec60f0d2b567313b096c8 md5sum = 9858181c89a361ef93ede0eac8d56034
[networkcache] [networkcache]
# signature certificates of the following uploaders. # signature certificates of the following uploaders.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment