Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...

diff --git a/facts/hosts.rb b/facts/hosts.rb
new file mode 100644 (file)
index 0000000..82395ed
--- /dev/null
+++ b/facts/hosts.rb
@@ -0,0 +1,19 @@
+Facter.add("brokenhosts") do
+       confine :kernel => :linux
+       brokenhosts = "true"
+       if FileTest.exist?("/etc/hosts")
+               IO.foreach("/etc/hosts") do |x|
+                       x.split.each do |y|
+                               if y == Facter.value("fqdn")
+                                       brokenhosts = "false"
+                                       break
+                               end
+                       end
+               end
+       end
+       setcode do
+               brokenhosts == "true"
+       end
+end
+
+

diff --git a/manifests/site.pp b/manifests/site.pp
index 953000e..a88b728 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -72,8 +72,8 @@ node default {
                     { include geodns }
          default:   {}
      }
-}
-
-node penalosa inherits default {
-    include hosts
+     case $brokenhosts {
+         "true":    { include hosts }
+         default:   {}
+     }
 }

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index c429f48..8742413 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -193,10 +193,16 @@ timeout_frozen_after=14d
 
 message_size_limit = 100M
 message_logs = false
-smtp_accept_max = 300
 smtp_accept_max_per_host = ${if match_ip {$sender_host_address}{+debianhosts}{0}{7}}
+<% if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty? %>
+smtp_accept_max = 300
 smtp_accept_queue = 200
 smtp_accept_queue_per_connection = 50
+<% else %>
+smtp_accept_max = 30
+smtp_accept_queue = 20
+smtp_accept_queue_per_connection = 10
+<% end %>
 smtp_accept_reserve = 25
 smtp_reserve_hosts = +debianhosts
 
@@ -206,9 +212,15 @@ check_spool_space  = 20M
 
 delay_warning =
 
+<% if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty? %>
 queue_run_max = 50
 deliver_queue_load_max = 50
 queue_only_load = 15
+<% else %>
+queue_run_max = 5
+deliver_queue_load_max = 10
+queue_only_load = 5
+<% end %>
 queue_list_requires_admin = false
 
 <%= out  = ""
@@ -1578,7 +1590,6 @@ out
 begin retry
 
 debian.org            *           F,2h,10m; G,16h,2h,1.5; F,14d,8h
-*                      * senders=: F,2h,10m
 *                      rcpt_4xx    F,2h,5m;  F,4h,10m; F,4d,15m
 *                      *           F,2h,15m; G,16h,2h,1.5; F,4d,8h
 

diff --git a/modules/hosts/manifests/init.pp b/modules/hosts/manifests/init.pp
index 468107d..279da0f 100644 (file)
--- a/modules/hosts/manifests/init.pp
+++ b/modules/hosts/manifests/init.pp
@@ -1,7 +1,7 @@
 class hosts {
 
     file {
-        "/etc/hosts": content => template("etc-hosts.erb");
+        "/etc/hosts": content => template("hosts/etc-hosts.erb");
     }
 }
 

diff --git a/modules/hosts/templates/etc-hosts.erb b/modules/hosts/templates/etc-hosts.erb
new file mode 100644 (file)
index 0000000..1105ac3
--- /dev/null
+++ b/modules/hosts/templates/etc-hosts.erb
@@ -0,0 +1,15 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+127.0.0.1       localhost
+<%= ipaddress %>        <%= fqdn %> <%= hostname %>
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 5debc1e..33e40c4 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -50,6 +50,7 @@ nagios                ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[02] show status
 nagios         master=(ALL)    NOPASSWD: /usr/sbin/mpt-status -s
 nagios         powell=(ALL)    NOPASSWD: /usr/local/sbin/areca-cli vsf info
 nagios         puccini=(ALL)   NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status
+nagios         bellini,cimarosa=(ALL)  NOPASSWD: /usr/local/bin/arcconf GETCONFIG 1 LD, /usr/local/bin/arcconf GETCONFIG 1 AD
 
 # groups and their role accounts
 %buildd                ALL=(buildd)    ALL

diff --git a/templates/etc-hosts.erb b/templates/etc-hosts.erb
deleted file mode 100644 (file)
index 1105ac3..0000000
--- a/templates/etc-hosts.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-127.0.0.1       localhost
-<%= ipaddress %>        <%= fqdn %> <%= hostname %>
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts