diff --git a/manifests/apache/rewrite_domains.pp b/manifests/apache/rewrite_domains.pp index 10b8e6e..be88307 100644 --- a/manifests/apache/rewrite_domains.pp +++ b/manifests/apache/rewrite_domains.pp @@ -1,46 +1,46 @@ # Simple apache domain rewriting class profile::apache::rewrite_domains { include ::apache include ::profile::ssl $ssl_protocol = hiera('apache::ssl_protocol') $ssl_honorcipherorder = hiera('apache::ssl_honorcipherorder') $ssl_cipher = hiera('apache::ssl_cipher') $hsts_header = hiera('apache::hsts_header') - $redirect_domains = hiera_hash('apache::redirect_domains') - each($redirect_domains) |$name, $data| { + $rewrite_domains = hiera_hash('apache::rewrite_domains') + each($rewrite_domains) |$name, $data| { $ssl_cert_name = $data['ssl_cert_name'] $ssl_cert = $::profile::ssl::certificate_paths[$ssl_cert_name] $ssl_ca = $::profile::ssl::ca_paths[$ssl_cert_name] $ssl_key = $::profile::ssl::private_key_paths[$ssl_cert_name] ::apache::vhost {"${name}_non-ssl": servername => $name, port => '80', docroot => '/var/www', redirect_status => 'permanent', redirect_dest => "https://${name}/", } ::apache::vhost {"${name}_ssl": servername => $name, port => '443', ssl => true, ssl_protocol => $ssl_protocol, ssl_honorcipherorder => $ssl_honorcipherorder, ssl_cipher => $ssl_cipher, ssl_cert => $ssl_cert, ssl_ca => $ssl_ca, ssl_key => $ssl_key, headers => [$hsts_header], docroot => '/var/www', rewrites => [ { rewrite_rule => $data['rewrites'], }, ], } } }