summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp7
1 files changed, 6 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index af55f7e..2196b55 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,7 +28,7 @@ class apache(
$sites = "/etc/apache2/sites",
$mods = "/etc/apache2/mods",
$conf_d = "/etc/apache2/conf.d",
- $macros = "/etc/apache2/conf.d/macros",
+ $macros = "/etc/apache2/conf.d/macros.conf",
$conf = "/etc/apache2/apache2.conf",
$www_folder = "/var/www/data",
$error_folder = "/var/www/error",
@@ -225,4 +225,9 @@ class apache(
default => undef,
},
}
+
+ # Legacy configuration
+ file { "$conf_d/macros":
+ ensure => absent,
+ }
}