diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-03-16 14:22:31 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-03-16 14:22:31 -0300 |
| commit | 2ebc136f0f432f5fdeeffab01198289b657332b0 (patch) | |
| tree | 4c0b10038d59e08736f94b01eac4d4801df98d4c /templates | |
| parent | af91d2e0abe4174440b132ea4d046a69b97214ae (diff) | |
| download | puppet-apache-2ebc136f0f432f5fdeeffab01198289b657332b0.tar.gz puppet-apache-2ebc136f0f432f5fdeeffab01198289b657332b0.tar.bz2 | |
Support for custom http and https ports
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/default.erb | 2 | ||||
| -rw-r--r-- | templates/error.erb | 2 | ||||
| -rw-r--r-- | templates/site.erb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/templates/default.erb b/templates/default.erb index a4361b7..8b49c77 100644 --- a/templates/default.erb +++ b/templates/default.erb @@ -1,5 +1,5 @@ # begin vhost for <%= fqdn %> -<VirtualHost *:80> +<VirtualHost *:<%= scope.lookupvar('apache::http_port') %>> ServerName <%= fqdn %> DocumentRoot <%= scope.lookupvar('apache::default_folder') %> diff --git a/templates/error.erb b/templates/error.erb index 70693fe..9f13fd9 100644 --- a/templates/error.erb +++ b/templates/error.erb @@ -1,5 +1,5 @@ # vhost to handle inexistent vhosts -<VirtualHost *:80> +<VirtualHost *:<%= scope.lookupvar('apache::http_port') %>> ServerName error.<%= hosting_domain %> ServerAlias *.<%= hosting_domain %> DocumentRoot <%= scope.lookupvar('apache::error_folder') %> diff --git a/templates/site.erb b/templates/site.erb index 6287326..b044a2e 100644 --- a/templates/site.erb +++ b/templates/site.erb @@ -1,5 +1,5 @@ # begin vhost for <%= title %> -<VirtualHost <%= listen %>:80> +<VirtualHost <%= listen %>:<%= scope.lookupvar('apache::http_port') %>> ServerName <%= title %>.<%= hosting_domain %> <% if server_alias != false %> ServerAlias <%= server_alias %><% end %> DocumentRoot <%= docroot %> @@ -37,7 +37,7 @@ # end vhost for <%= title %> <% if ssl == true %> # begin ssl vhost for <%= title %> -<VirtualHost <%= listen %>:443> +<VirtualHost <%= listen %>:<%= scope.lookupvar('apache::https_port') %>> # Use HTTP Strict Transport Security to force client to use secure connections only Header always set Strict-Transport-Security "max-age=15768000; includeSubDomains" |