[icinga-checkins] icinga.org: chef-icinga2/master: iBug #8469 mod_python deprecated for centos7/rhel7

git at icinga.org git at icinga.org
Thu Feb 19 18:40:03 CET 2015


Module: chef-icinga2
Branch: master
Commit: a7bc15d678917de4f544c2e55d601bf564b0a7e5
URL:    https://git.icinga.org/?p=chef-icinga2.git;a=commit;h=a7bc15d678917de4f544c2e55d601bf564b0a7e5

Author: Virender Khatri <vir.khatri at gmail.com>
Date:   Thu Feb 19 23:27:47 2015 +0530

iBug #8469 mod_python deprecated for centos7/rhel7

---

 attributes/server_apache.rb |    7 +++++++
 recipes/server_apache.rb    |    7 +------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/attributes/server_apache.rb b/attributes/server_apache.rb
new file mode 100644
index 0000000..df83642
--- /dev/null
+++ b/attributes/server_apache.rb
@@ -0,0 +1,7 @@
+
+default['icinga2']['apache_modules'] = value_for_platform(
+  %w(centos redhat fedora) => { '7' => %w(default mod_wsgi mod_php5 mod_cgi mod_ssl mod_rewrite),
+                                'default' => %w(default mod_python mod_php5 mod_cgi mod_ssl mod_rewrite) },
+  'amazon' => { 'default' => %w(default mod_python mod_php5 mod_cgi mod_ssl mod_rewrite) },
+  'ubuntu' => { 'default' => %w(default mod_python mod_php5 mod_cgi mod_ssl mod_rewrite) }
+)
diff --git a/recipes/server_apache.rb b/recipes/server_apache.rb
index e7a14e7..a359a69 100644
--- a/recipes/server_apache.rb
+++ b/recipes/server_apache.rb
@@ -19,12 +19,7 @@
 
 node.default['apache']['servertokens']    = 'Minimal'
 
-include_recipe 'apache2::default'
-include_recipe 'apache2::mod_python'
-include_recipe 'apache2::mod_php5'
-include_recipe 'apache2::mod_cgi'
-include_recipe 'apache2::mod_ssl'
-include_recipe 'apache2::mod_rewrite'
+node['icinga2']['apache_modules'].each { |mod| include_recipe "apache2::#{mod}" }
 
 # keeping it to default for now, need
 # to look into merging into a single



More information about the icinga-checkins mailing list