Revert to civicrm 4.6.26

[chef.git] / cookbooks / munin / recipes / server.rb

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index 4729f4321edc6c5981dec81989a332065dd932b5..5861bf5ea6e1b6fbe2d72901e67e4e58e3a7bca8 100644 (file)
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache"
+include_recipe "apache::ssl"

 
 package "munin"
 package "rrdcached"
 
 package "munin"
 package "rrdcached"


@@ -27,13 +27,13 @@ template "/etc/default/rrdcached" do
   source "rrdcached.erb"
   owner "root"
   group "root"
   source "rrdcached.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 directory "/var/lib/munin/rrdcached" do
   owner "munin"
   group "munin"
 end
 
 directory "/var/lib/munin/rrdcached" do
   owner "munin"
   group "munin"

-  mode 0755
+  mode 0o755

 end
 
 service "rrdcached" do
 end
 
 service "rrdcached" do


@@ -45,42 +45,82 @@ munin_plugin "rrdcached"
 
 expiry_time = 14 * 86400
 
 
 expiry_time = 14 * 86400
 

-clients = search(:node, "recipes:munin").select { |n| n[:munin] }.sort_by { |n| n[:hostname] }
-frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort
-backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort
+clients = search(:node, "recipes:munin\\:\\:default").sort_by { |n| n[:hostname] } # ~FC010
+frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort # ~FC010
+backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort # ~FC010

 tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|
 tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|

-  { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface] }
+  { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }

 end
 renderers = search(:node, "roles:tile").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|
 end
 renderers = search(:node, "roles:tile").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|

-  { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface] }
+  { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
+end
+geocoders = search(:node, "roles:nominatim").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|
+  { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }

 end
 
 template "/etc/munin/munin.conf" do
   source "munin.conf.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/munin/munin.conf" do
   source "munin.conf.erb"
   owner "root"
   group "root"

-  mode 0644
-  variables :expiry_time => expiry_time, :clients => clients, :frontends => frontends, :backends => backends, :tilecaches => tilecaches, :renderers => renderers
+  mode 0o644
+  variables :expiry_time => expiry_time, :clients => clients,
+            :frontends => frontends, :backends => backends,
+            :tilecaches => tilecaches, :renderers => renderers,
+            :geocoders => geocoders

 end
 
 apache_module "fcgid"
 apache_module "rewrite"
 end
 
 apache_module "fcgid"
 apache_module "rewrite"

+apache_module "headers"

 
 remote_directory "/srv/munin.openstreetmap.org" do
   source "www"
   owner "root"
   group "root"
 
 remote_directory "/srv/munin.openstreetmap.org" do
   source "www"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0755
-  purge true
+  files_mode 0o644
+end
+
+# directory to put dumped files in
+directory "/srv/munin.openstreetmap.org/dumps" do
+  owner "www-data"
+  group "www-data"
+  mode 0o755
+end
+
+ssl_certificate "munin.openstreetmap.org" do
+  domains ["munin.openstreetmap.org", "munin.osm.org"]
+  notifies :reload, "service[apache2]"

 end
 
 apache_site "munin.openstreetmap.org" do
   template "apache.erb"
 end
 
 end
 
 apache_site "munin.openstreetmap.org" do
   template "apache.erb"
 end
 

+template "/etc/cron.daily/munin-backup" do
+  source "backup.cron.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+# simple shell script to dump RRD data to a file
+cookbook_file "/usr/local/bin/rrddump" do
+  source "rrddump.sh"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+template "/etc/cron.d/rrddump" do
+  source "rrddump.cron.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+

 munin_plugin "munin_stats"
 munin_plugin "munin_update"
 munin_plugin "munin_rrdcached"
 munin_plugin "munin_stats"
 munin_plugin "munin_update"
 munin_plugin "munin_rrdcached"