remove confusing apache::cache manifest

diff --git a/modules/apache2/manifests/cache.pp b/modules/apache2/manifests/cache.pp
deleted file mode 100644 (file)
index bdbed4d..0000000
--- a/modules/apache2/manifests/cache.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache2::cache {
-       apache2::module { 'expires': }
-       apache2::module { 'rewrite': }
-}

diff --git a/modules/apache2/manifests/rewrite.pp b/modules/apache2/manifests/rewrite.pp
new file mode 100644 (file)
index 0000000..58b8b08
--- /dev/null
+++ b/modules/apache2/manifests/rewrite.pp
@@ -0,0 +1,3 @@
+class apache2::rewrite {
+       apache2::module { 'rewrite': }
+}

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 04a0d7f..470fb4a 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -20,7 +20,9 @@ class roles::security_mirror {
                default => undef,
        }
 
-       include apache2::cache
+       include apache2::expires
+       include apache2::rewrite
+
        apache2::site { '010-security.debian.org':
                site   => 'security.debian.org',
                content => template('roles/security_mirror/security.debian.org.erb')

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 0470ac9..d92bd4d 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,7 +1,8 @@
 class roles::static_mirror {
 
        include roles::static_source
-       include apache2::cache
+       include apache2::expires
+       include apache2::rewrite
 
        package { 'libapache2-mod-geoip': ensure => installed, }
        package { 'geoip-database': ensure => installed, }