aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <dev@blino.org>2017-02-21 00:48:25 +0100
committerOlivier Blin <dev@blino.org>2017-02-21 00:50:03 +0100
commitabd69d217716cdc81e8628ab2978dd5aec4f90f9 (patch)
tree29cb158b25ade0f6de6c0ebf62b335105bfcec46
parente31869325686b78c9e9c41b039d4cf691af200fc (diff)
downloadpuppet-abd69d217716cdc81e8628ab2978dd5aec4f90f9.tar
puppet-abd69d217716cdc81e8628ab2978dd5aec4f90f9.tar.gz
puppet-abd69d217716cdc81e8628ab2978dd5aec4f90f9.tar.bz2
puppet-abd69d217716cdc81e8628ab2978dd5aec4f90f9.tar.xz
puppet-abd69d217716cdc81e8628ab2978dd5aec4f90f9.zip
Remove broken apache-mod_deflate package requirement
This has been provided by the apache package directly since Mga3. apache-mod_deflate was used for the planet config only, on the champagne host, running Mga4. puppet failed because it did not handle the virtual package from the apache package: Error: Package apache-mod_deflate was not present after trying to install it Error: /Stage[main]/Apache::Mod::Deflate/Package[apache-mod_deflate]/ensure: change from absent to present failed: Package apache-mod_deflate was not present after trying to install it
-rw-r--r--modules/apache/manifests/mod/deflate.pp4
-rw-r--r--modules/planet/manifests/init.pp1
2 files changed, 0 insertions, 5 deletions
diff --git a/modules/apache/manifests/mod/deflate.pp b/modules/apache/manifests/mod/deflate.pp
deleted file mode 100644
index 0e2211aa..00000000
--- a/modules/apache/manifests/mod/deflate.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache::mod::deflate {
- include apache::base
- package { 'apache-mod_deflate': }
-}
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 88e36a6f..8aacd5cc 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -10,7 +10,6 @@ class planet {
$location = "/var/www/vhosts/${vhost}"
include apache::mod::php
- include apache::mod::deflate
apache::vhost::base { $vhost:
location => $location,