install mod-macro everywhere

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index dec3162d6d6a3c2873145bd169c42806a77c7ff4..a3d47f1a0c00ac4dd3e2892f58db545a7121cbcb 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,5 +1,4 @@
 class apache2 {
-
        package { 'apache2':
                ensure => installed,
        }
@@ -12,6 +11,14 @@ class apache2 {
        apache2::module { 'info': }
        apache2::module { 'status': }
 
+       package { 'libapache2-mod-macro':
+               ensure => installed
+       }
+
+       apache2::module { 'macro':
+               require => Package['libapache2-mod-macro']
+       }
+
        apache2::site { '00-default':
                site     => 'default-debian.org',
                content  => template('apache2/default-debian.org.erb'),

diff --git a/modules/apache2/manifests/macro.pp b/modules/apache2/manifests/macro.pp
deleted file mode 100644 (file)
index b25fe97..0000000
--- a/modules/apache2/manifests/macro.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class apache2::macro {
-       package { 'libapache2-mod-macro':
-               ensure => installed
-       }
-
-       apache2::module { 'macro':
-               require => Package['libapache2-mod-macro']
-       }
-}

diff --git a/modules/roles/manifests/dakmaster.pp b/modules/roles/manifests/dakmaster.pp
index 7209befb7880f7f11d1f15f8f6bb0b9498ef596d..4624090f2ee290164de4c8864d6415303df99767 100644 (file)
--- a/modules/roles/manifests/dakmaster.pp
+++ b/modules/roles/manifests/dakmaster.pp
@@ -1,11 +1,4 @@
 class roles::dakmaster {
-
-       package { 'libapache2-mod-macro':
-               ensure => installed,
-       }
-
-       apache2::module { 'macro': }
-
        apache2::config { 'puppet-builddlist':
                content => template('roles/dakmaster/conf-builddlist.erb'),
        }

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 9c4b93b007dd1d4b66ad93886fa06fdbf771237b..cdaa9afbcbf71b2dd2c5441fdc733d18eee2ea34 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -3,11 +3,9 @@ class roles::static_mirror {
        include roles::static_source
        include apache2::cache
 
-       package { 'libapache2-mod-macro': ensure => installed, }
        package { 'libapache2-mod-geoip': ensure => installed, }
        package { 'geoip-database': ensure => installed, }
 
-       apache2::module { 'macro': require => Package['libapache2-mod-macro']; }
        apache2::module { 'rewrite': }
        apache2::module { 'include': }
        apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }