apache: Add support for port based SSL virtual hosts

apache/manifests/debian.pp

@@ -184,7 +184,7 @@ class apache::debian::sslserver inherits apache::debian::common {
 }
 
 
-define apache::debian::sslsite($first, $hsts, $ipaddr, $root,
+define apache::debian::sslsite($first, $hsts, $ipaddr, $port, $root,
                                $ssl_cert, $ssl_key, $ssl_chain, $proxy) {
 
     if $name == "default" {

apache/manifests/init.pp

@@ -305,6 +305,18 @@ define apache::sslsite($first=false, $hsts=false, $ipaddr="_default_", $root="",
         include apache::mod::headers
     }
 
+    if $name =~ /:([0-9]+)$/ {
+        $port = $1
+        if ! defined(Apache::Configfile["listen_${port}.conf"]) {
+            apache::configfile { "listen_${port}.conf":
+                http    => false,
+                content => "Listen ${port}\n",
+            }
+        }
+    } else {
+        $port = "443"
+    }
+
     case $::operatingsystem {
         "debian","ubuntu": {
             $apache_ssldir = "/etc/ssl"
@@ -312,6 +324,7 @@ define apache::sslsite($first=false, $hsts=false, $ipaddr="_default_", $root="",
                 first     => $first,
                 hsts      => $hsts,
                 ipaddr    => $ipaddr,
+                port      => $port,
                 root      => $root,
                 ssl_cert  => $ssl_cert,
                 ssl_key   => $ssl_key,
@@ -326,6 +339,7 @@ define apache::sslsite($first=false, $hsts=false, $ipaddr="_default_", $root="",
                 first     => $first,
                 hsts      => $hsts,
                 ipaddr    => $ipaddr,
+                port      => $port,
                 root      => $root,
                 ssl_cert  => $ssl_cert,
                 ssl_key   => $ssl_key,

apache/manifests/redhat.pp

@@ -223,7 +223,7 @@ class apache::redhat::sslserver {
 }
 
 
-define apache::redhat::sslsite($first, $hsts, $ipaddr, $root,
+define apache::redhat::sslsite($first, $hsts, $ipaddr, $port, $root,
                                $ssl_cert, $ssl_key, $ssl_chain, $proxy) {
 
     if $name == "default" {

apache/templates/site.https.conf.erb

@@ -1,7 +1,7 @@
-<VirtualHost <%= @ipaddr %>:443>
+<VirtualHost <%= @ipaddr %>:<%= @port %>>
 
 # General setup for the virtual host, inherited from global configuration
-ServerName <%= @site_fqdn %>:443
+ServerName <%= @site_fqdn %>
 
 # Use separate log files for the SSL virtual host; note that LogLevel
 # is not inherited from httpd.conf.