From eb83c03ddda8253f230fc144574a3891fd28f874 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 1 Feb 2017 08:46:22 +0100 Subject: [PATCH] remove confusing apache::cache manifest --- modules/apache2/manifests/cache.pp | 4 ---- modules/apache2/manifests/rewrite.pp | 3 +++ modules/roles/manifests/security_mirror.pp | 4 +++- modules/roles/manifests/static_mirror.pp | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 modules/apache2/manifests/cache.pp create mode 100644 modules/apache2/manifests/rewrite.pp diff --git a/modules/apache2/manifests/cache.pp b/modules/apache2/manifests/cache.pp deleted file mode 100644 index bdbed4db9..000000000 --- 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 index 000000000..58b8b08c1 --- /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 04a0d7fad..470fb4a45 100644 --- 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 0470ac986..d92bd4d2e 100644 --- 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, } -- 2.20.1