Fix some config files

diff --git a/manifests/init.pp b/manifests/init.pp
index 91b20b3166e3497786c42f1b944d8e5186c65b25..497d5a37b8df1b5486a6d72159d0bea46a293b3e 100644 (file)
--- 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,
   }