Commit e94c9345 authored by Romain Courteaud's avatar Romain Courteaud

[software/htmlvalidatorserver] Access vnu over https

parent efd20411
...@@ -45,3 +45,11 @@ script = ...@@ -45,3 +45,11 @@ script =
extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum'))) extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
workdir = guessworkdir(extract_dir) workdir = guessworkdir(extract_dir)
self.copyTree(workdir, "%(location)s") self.copyTree(workdir, "%(location)s")
[java-re-8-output]
# Shared binary location to ease migration
recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command = ${coreutils-output:test} -x ${:keytool}
keytool = ${java-re-8:location}/bin/keytool
...@@ -23,6 +23,20 @@ catalina_conf = $${:catalina_base}/conf ...@@ -23,6 +23,20 @@ catalina_conf = $${:catalina_base}/conf
################################# #################################
# Tomcat service # Tomcat service
################################# #################################
[keystore]
recipe = plone.recipe.command
command =
${java-re-8-output:keytool} \
-genkeypair \
-alias "tomcat" \
-keyalg RSA \
-keypass "$${:pass}" \
-dname "CN=Web Server,OU=Unit,O=Organization,L=City,S=State,C=Country" \
-keystore "$${:file}" \
-storepass "$${:pass}"
file = $${basedirectory:catalina_base}/.keystore
pass = insecure
[tomcat-service] [tomcat-service]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${template-tomcat-service:output} url = ${template-tomcat-service:output}
...@@ -38,6 +52,7 @@ output = $${basedirectory:catalina_conf}/server.xml ...@@ -38,6 +52,7 @@ output = $${basedirectory:catalina_conf}/server.xml
mode = 0600 mode = 0600
ip = $${slap-network-information:global-ipv6} ip = $${slap-network-information:global-ipv6}
port = 8899 port = 8899
scheme = https
[tomcat-listen-promise] [tomcat-listen-promise]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
...@@ -51,7 +66,7 @@ path = $${basedirectory:promises}/tomcat_listen ...@@ -51,7 +66,7 @@ path = $${basedirectory:promises}/tomcat_listen
[publish-url] [publish-url]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
<= monitor-publish <= monitor-publish
vnu-url = http://[$${tomcat-configuration:ip}]:$${tomcat-configuration:port}/ vnu-url = $${tomcat-configuration:scheme}://[$${tomcat-configuration:ip}]:$${tomcat-configuration:port}/
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-httpd-port = 8333 monitor-httpd-port = 8333
......
...@@ -6,9 +6,12 @@ ...@@ -6,9 +6,12 @@
address="$${tomcat-configuration:ip}" address="$${tomcat-configuration:ip}"
port="$${tomcat-configuration:port}" port="$${tomcat-configuration:port}"
maxThreads="10" maxThreads="10"
scheme="http" scheme="$${tomcat-configuration:scheme}"
secure="false" secure="true"
clientAuth="false" clientAuth="false"
SSLEnabled="true"
keystorePass="$${keystore:pass}"
keystoreFile="$${keystore:file}"
/> />
<Engine name="Catalina" defaultHost="localhost"> <Engine name="Catalina" defaultHost="localhost">
......
...@@ -20,7 +20,7 @@ parts = ...@@ -20,7 +20,7 @@ parts =
[template-tomcat-configuration] [template-tomcat-configuration]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/server.xml.in url = ${:_profile_base_location_}/server.xml.in
md5sum = 8b1db3f4107033985df25bd4730571d3 md5sum = 9978b8b9e567f33cb4c853fee85f1637
output = ${buildout:directory}/server.xml.in output = ${buildout:directory}/server.xml.in
mode = 0644 mode = 0644
...@@ -37,7 +37,7 @@ mode = 0644 ...@@ -37,7 +37,7 @@ mode = 0644
[template-validator] [template-validator]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-validator.cfg.in url = ${:_profile_base_location_}/instance-validator.cfg.in
md5sum = 30c0294f5a0cad1f3c2833c1cc61b3c4 md5sum = 0275d7a8a021f84a1303e5c8933c07c3
output = ${buildout:directory}/template-validator.cfg output = ${buildout:directory}/template-validator.cfg
mode = 0644 mode = 0644
......
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