diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-07-31 17:31:10 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-07-31 17:31:10 -0300 |
| commit | 4a2f2a9beb960629c686cd0179fc9926040ed28c (patch) | |
| tree | e603dc47cebe173589c1d5a5aec63df07472915a /manifests | |
| parent | 5f53fa72f25e73caa21acc1a67161cd1e8d2db09 (diff) | |
| download | puppet-apache-4a2f2a9beb960629c686cd0179fc9926040ed28c.tar.gz puppet-apache-4a2f2a9beb960629c686cd0179fc9926040ed28c.tar.bz2 | |
Move macros do macros.conf
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 7 |
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, + } } |