summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp18
1 files changed, 14 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 91b20b3..497d5a3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -36,7 +36,7 @@ class apache(
$error_dest = "http://${domain}/missing.html",
$default_folder = '/var/www/data',
$server_name = $hostname,
- $https_proxy = 'no',
+ $https_proxy = 'yes',
$remote_addr = false,
$http_port = '80',
$https_port = '443',
@@ -242,9 +242,14 @@ class apache(
notify => Service["apache2"],
}
+ # Old config file without .conf extension
+ file { "$conf_d/https-proxy":
+ ensure => absent,
+ }
+
# https proxy configuration
# see http://www.metaltoad.com/blog/running-drupal-secure-pages-behind-proxy
- file { "$conf_d/https-proxy":
+ file { "$conf_d/https-proxy.conf":
ensure => $https_proxy ? {
'' => absent,
default => present,
@@ -259,10 +264,15 @@ class apache(
notify => Service["apache2"],
}
+ # Old config file without .conf extension
+ file { "$conf_d/remote-addr":
+ ensure => absent,
+ }
+
# TODO: remove this in the future
# remote addr rewrite
# see http://stackoverflow.com/questions/2328225/how-to-set-remote-addr-in-apache-before-php-is-invoked
- file { "$conf_d/remote-addr":
+ file { "$conf_d/remote-addr.conf":
ensure => $remote_addr ? {
false => absent,
default => present,
@@ -288,7 +298,7 @@ class apache(
refreshonly => true,
}
- # Legacy configuration
+ # Old config file without .conf extension
file { "$conf_d/macros":
ensure => absent,
}