apache-frontend: Add port-redirection config file generation

software/apache-frontend/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg
-md5sum = d6570c7a7e3c48efa7305677fe7c7ceb
+md5sum = 274788ae9701ee1aabe26d1237f174e7
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in

software/apache-frontend/instance-apache-frontend.cfg

@@ -15,6 +15,7 @@ parts =
   frontend-nginx-graceful
   dynamic-template-default-vh
   not-found-html
+  port-redirection
   promise-frontend-apache-configuration
   promise-apache-frontend-v4-https
   promise-apache-frontend-v4-http
@@ -758,3 +759,13 @@ port = $${instance-parameter:configuration.plain_nginx_port}
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $${nginx-configuration:pid-file} 
 wrapper-path = $${directory:promise}/promise-nginx-is-process-older-than-dependency-set
+
+[port-redirection]
+<= jinja2-template-base
+template = inline:
+  [{"srcPort": 80, "destPort": {{ http_port }}}, {"srcPort": 443, "destPort": {{ https_port }}}]
+rendered = $${buildout:directory}/.slapos-port-redirect
+mode = 0644
+extra-context =
+    key http_port instance-parameter:configuration.plain_http_port
+    key https_port instance-parameter:configuration.port