Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  slow down some more search spiders
  move all files to explicit new-style module/ paths
  and apache module
  convert exim module to new syntax - why it needs to change, I don't know
  these settings seem to break samhain on wolkenstein - how odd
  ignore bind stuff on geo servers as well
  libdns66 can be ignored as well - pesky sonames
  The geo's no longer have a local geoip set of packages

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index fb88994c6d9430ba853b54ede0e8be73a163d7a1..c72e2b57b94ed97cb3949b305892a1bb64585409 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -18,8 +18,8 @@ class apache2 {
             }
 
             file { "/etc/php5/conf.d/suhosin.ini":
-                source  => [ "puppet:///apache2/per-host/$fqdn/etc/php5/conf.d/suhosin.ini",
-                             "puppet:///apache2/common/etc/php5/conf.d/suhosin.ini" ],
+                source  => [ "puppet:///modules/apache2/per-host/$fqdn/etc/php5/conf.d/suhosin.ini",
+                             "puppet:///modules/apache2/common/etc/php5/conf.d/suhosin.ini" ],
                 require => Package["apache2", "php5-suhosin"],
                 notify  => Exec["force-reload-apache2"];
             }
@@ -86,18 +86,18 @@ class apache2 {
             require => Package["apache2"],
                         notify  => Exec["reload-apache2"];
         "/etc/apache2/conf.d/security":
-            source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/security",
-                         "puppet:///apache2/common/etc/apache2/conf.d/security" ],
+            source  => [ "puppet:///modules/apache2/per-host/$fqdn/etc/apache2/conf.d/security",
+                         "puppet:///modules/apache2/common/etc/apache2/conf.d/security" ],
             require => Package["apache2"],
             notify  => Exec["reload-apache2"];
         "/etc/apache2/conf.d/local-serverinfo":
-            source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/local-serverinfo",
-                         "puppet:///apache2/common/etc/apache2/conf.d/local-serverinfo" ],
+            source  => [ "puppet:///modules/apache2/per-host/$fqdn/etc/apache2/conf.d/local-serverinfo",
+                         "puppet:///modules/apache2/common/etc/apache2/conf.d/local-serverinfo" ],
             require => Package["apache2"],
             notify  => Exec["reload-apache2"];
         "/etc/apache2/conf.d/server-status":
-            source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/server-status",
-                         "puppet:///apache2/common/etc/apache2/conf.d/server-status" ],
+            source  => [ "puppet:///modules/apache2/per-host/$fqdn/etc/apache2/conf.d/server-status",
+                         "puppet:///modules/apache2/common/etc/apache2/conf.d/server-status" ],
             require => Package["apache2"],
             notify  => Exec["reload-apache2"];
 
@@ -107,8 +107,8 @@ class apache2 {
             notify  => Exec["reload-apache2"];
 
         "/etc/logrotate.d/apache2":
-            source  => [ "puppet:///apache2/per-host/$fqdn/etc/logrotate.d/apache2",
-                         "puppet:///apache2/common/etc/logrotate.d/apache2" ];
+            source  => [ "puppet:///modules/apache2/per-host/$fqdn/etc/logrotate.d/apache2",
+                         "puppet:///modules/apache2/common/etc/logrotate.d/apache2" ];
 
         "/srv/www":
             mode    => 755,
@@ -148,7 +148,7 @@ class apache2 {
     }
     @ferm::rule { "dsa-http-soso":
         prio            => "21",
-        description     => "slow yahoo spider",
+        description     => "slow soso spider",
         chain           => 'limit_sosospider',
         rule            => '
                             mod connlimit connlimit-above 2 connlimit-mask 21 jump DROP;
@@ -164,6 +164,15 @@ class apache2 {
                             jump http_limit;
                            '
     }
+    @ferm::rule { "dsa-http-google":
+        prio            => "21",
+        description     => "slow google spider",
+        chain           => 'limit_google',
+        rule            => '
+                            mod connlimit connlimit-above 2 connlimit-mask 19 jump DROP;
+                            jump http_limit;
+                           '
+    }
     @ferm::rule { "dsa-http-bing":
         prio            => "21",
         description     => "slow bing spider",
@@ -178,9 +187,10 @@ class apache2 {
         description     => "http subchain",
         chain           => 'http',
         rule            => '
-                            saddr ( 74.6.22.182 74.6.18.240 ) jump limit_yahoo;
+                            saddr ( 74.6.22.182 74.6.18.240 67.195.0.0/16 ) jump limit_yahoo;
                             saddr 124.115.0.0/21 jump limit_sosospider;
                             saddr (65.52.0.0/14 207.46.0.0/16) jump limit_bing;
+                            saddr (66.249.64.0/19) jump limit_google;
 
                             mod recent name HTTPDOS update seconds 1800 jump log_or_drop;
                             mod hashlimit hashlimit-name HTTPDOS hashlimit-mode srcip hashlimit-burst 600 hashlimit 30/minute jump ACCEPT;

diff --git a/modules/apache2/manifests/security_mirror.pp b/modules/apache2/manifests/security_mirror.pp
index bdc3bcce1504ea737475595b51a3e5fc98066765..fba5ad4742712079dd93079d2784177919cb865b 100644 (file)
--- a/modules/apache2/manifests/security_mirror.pp
+++ b/modules/apache2/manifests/security_mirror.pp
@@ -1,8 +1,8 @@
 class apache2::security_mirror inherits apache2 {
     file {
         "/etc/apache2/sites-available/security.debian.org":
-            source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/sites-available/security.debian.org",
-                         "puppet:///apache2/common/etc/apache2/sites-available/security.debian.org" ];
+            source  => [ "puppet:///modules/apache2/per-host/$fqdn/etc/apache2/sites-available/security.debian.org",
+                         "puppet:///modules/apache2/common/etc/apache2/sites-available/security.debian.org" ];
 
     }
 

diff --git a/modules/apt-keys/manifests/init.pp b/modules/apt-keys/manifests/init.pp
index df61688131af84a08d46f429d0eaf5575bb89b88..c296ec55ef1a1bc89e07d112b3673e2ca2b19d01 100644 (file)
--- a/modules/apt-keys/manifests/init.pp
+++ b/modules/apt-keys/manifests/init.pp
@@ -7,12 +7,12 @@ class apt-keys {
             ;
 
         "/etc/apt/trusted-keys.d/backports.org.asc":
-            source  => "puppet:///apt-keys/backports.org.asc",
+            source  => "puppet:///modules/apt-keys/backports.org.asc",
             mode    => 664,
             notify  => Exec["apt-keys-update"],
             ;
         "/etc/apt/trusted-keys.d/db.debian.org.asc":
-            source  => "puppet:///apt-keys/db.debian.org.asc",
+            source  => "puppet:///modules/apt-keys/db.debian.org.asc",
             mode    => 664,
             notify  => Exec["apt-keys-update"],
             ;

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 16f844155a332d74bb0164ebbd8f0a907514d5e0..b5ec5806c63fa17a11d34c1dbddd8acb1ee99e16 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -15,16 +15,16 @@ class buildd {
              ;
        
         "/etc/apt/trusted-keys.d/buildd.debian.org.asc":
-             source  => "puppet:///buildd/buildd.debian.org.asc",
+             source  => "puppet:///modules/buildd/buildd.debian.org.asc",
              mode    => 664,
              notify  => Exec["apt-keys-update"],
              ;
         "/etc/schroot/mount-defaults":
-             source  => "puppet:///buildd/mount-defaults",
+             source  => "puppet:///modules/buildd/mount-defaults",
              require => Package["sbuild"]
              ;
         "/etc/cron.d/dsa-buildd":
-             source => "puppet:///buildd/cron.d-dsa-buildd",
+             source => "puppet:///modules/buildd/cron.d-dsa-buildd",
              require => Package["cron"]
              ;
     }

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index 6f42e1ac5a0411b137833c4e180cfad71d693087..c2bd0d10ca896543f9b58db543f10f4eeb2dd919 100644 (file)
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -7,11 +7,11 @@ class clamav {
     file {
         "/etc/clamav-unofficial-sigs.dsa.conf":
             require => Package["clamav-unofficial-sigs"],
-            source  => [ "puppet:///clamav/clamav-unofficial-sigs.dsa.conf" ]
+            source  => [ "puppet:///modules/clamav/clamav-unofficial-sigs.dsa.conf" ]
             ;
         "/etc/clamav-unofficial-sigs.conf":
             require => Package["clamav-unofficial-sigs"],
-            source  => [ "puppet:///clamav/clamav-unofficial-sigs.conf" ]
+            source  => [ "puppet:///modules/clamav/clamav-unofficial-sigs.conf" ]
             ;
     }
 }

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index d7229bcb3ffb7f1b411baf12695fab22af822be8..5bf93feebfca44845cb170bf3d2f135e3b260d2b 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -55,28 +55,28 @@ class exim {
           ;
         "/etc/exim4/host_blacklist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/host_blacklist",
-                       "puppet:///exim/common/host_blacklist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/host_blacklist",
+                       "puppet:///modules/exim/common/host_blacklist" ]
           ;
         "/etc/exim4/blacklist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/blacklist",
-                       "puppet:///exim/common/blacklist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/blacklist",
+                       "puppet:///modules/exim/common/blacklist" ]
           ;
         "/etc/exim4/callout_users":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/callout_users",
-                       "puppet:///exim/common/callout_users" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/callout_users",
+                       "puppet:///modules/exim/common/callout_users" ]
           ;
         "/etc/exim4/grey_users":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/grey_users",
-                       "puppet:///exim/common/grey_users" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/grey_users",
+                       "puppet:///modules/exim/common/grey_users" ]
           ;
         "/etc/exim4/helo-check":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/helo-check",
-                       "puppet:///exim/common/helo-check" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/helo-check",
+                       "puppet:///modules/exim/common/helo-check" ]
           ;
         "/etc/exim4/locals":
           require => Package["exim4-daemon-heavy"],
@@ -84,18 +84,18 @@ class exim {
           ;
         "/etc/exim4/localusers":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/localusers",
-                       "puppet:///exim/common/localusers" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/localusers",
+                       "puppet:///modules/exim/common/localusers" ]
           ;
         "/etc/exim4/rbllist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/rbllist",
-                       "puppet:///exim/common/rbllist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/rbllist",
+                       "puppet:///modules/exim/common/rbllist" ]
           ;
         "/etc/exim4/rhsbllist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/rhsbllist",
-                       "puppet:///exim/common/rhsbllist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/rhsbllist",
+                       "puppet:///modules/exim/common/rhsbllist" ]
           ;
         "/etc/exim4/virtualdomains":
           require => Package["exim4-daemon-heavy"],
@@ -103,48 +103,48 @@ class exim {
           ;
         "/etc/exim4/whitelist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/whitelist",
-                       "puppet:///exim/common/whitelist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/whitelist",
+                       "puppet:///modules/exim/common/whitelist" ]
           ;
         "/etc/exim4/submission-domains":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/submission-domains",
-                       "puppet:///exim/common/submission-domains" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/submission-domains",
+                       "puppet:///modules/exim/common/submission-domains" ]
           ;
         "/etc/logrotate.d/exim4-base":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-base",
-                       "puppet:///exim/common/logrotate-exim4-base" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/logrotate-exim4-base",
+                       "puppet:///modules/exim/common/logrotate-exim4-base" ]
           ;
         "/etc/logrotate.d/exim4-paniclog":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog",
-                       "puppet:///exim/common/logrotate-exim4-paniclog" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/logrotate-exim4-paniclog",
+                       "puppet:///modules/exim/common/logrotate-exim4-paniclog" ]
           ;
         "/etc/exim4/ssl/thishost.crt":
           require => Package["exim4-daemon-heavy"],
-          source  => "puppet:///exim/certs/$fqdn.crt",
+          source  => "puppet:///modules/exim/certs/$fqdn.crt",
           owner   => root,
           group   => Debian-exim,
           mode    => 640
           ;
         "/etc/exim4/ssl/thishost.key":
           require => Package["exim4-daemon-heavy"],
-          source  => "puppet:///exim/certs/$fqdn.key",
+          source  => "puppet:///modules/exim/certs/$fqdn.key",
           owner   => root,
           group   => Debian-exim,
           mode    => 640
           ;
         "/etc/exim4/ssl/ca.crt":
           require => Package["exim4-daemon-heavy"],
-          source  => "puppet:///exim/certs/ca.crt",
+          source  => "puppet:///modules/exim/certs/ca.crt",
           owner   => root,
           group   => Debian-exim,
           mode    => 640
           ;
         "/etc/exim4/ssl/ca.crl":
           require => Package["exim4-daemon-heavy"],
-          source  => "puppet:///exim/certs/ca.crl",
+          source  => "puppet:///modules/exim/certs/ca.crl",
           owner   => root,
           group   => Debian-exim,
           mode    => 640

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 3909f9b7ed366e918ab3802517aee1b711de069a..8a81592eca96f0f1f449de4c8e384a5bb3d6e39e 100644 (file)
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -5,15 +5,15 @@ class exim::mx inherits exim {
     file {
         "/etc/exim4/ccTLD.txt":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/ccTLD.txt" ]
+          source  => [ "puppet:///modules/exim/common/ccTLD.txt" ]
           ;
         "/etc/exim4/surbl_whitelist.txt":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/surbl_whitelist.txt" ]
+          source  => [ "puppet:///modules/exim/common/surbl_whitelist.txt" ]
           ;
         "/etc/exim4/exim_surbl.pl":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/exim_surbl.pl" ],
+          source  => [ "puppet:///modules/exim/common/exim_surbl.pl" ],
           notify  => Exec["exim4 restart"]
           ;
     }

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index b228e69bec7e44630c1210246d5de631423b9f45..d67f8fb65e74dcec106ebb0e845d6cc6f4074438 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -34,11 +34,11 @@ class ferm {
             ensure => directory,
             require => Package["ferm"];
         "/etc/default/ferm":
-            source  => "puppet:///ferm/ferm.default",
+            source  => "puppet:///modules/ferm/ferm.default",
             require => Package["ferm"],
             notify  => Exec["ferm restart"];
         "/etc/ferm/ferm.conf":
-            source  => "puppet:///ferm/ferm.conf",
+            source  => "puppet:///modules/ferm/ferm.conf",
             require => Package["ferm"],
             mode    => 0400,
             notify  => Exec["ferm restart"];
@@ -58,7 +58,7 @@ class ferm {
             mode    => 0400,
             notify  => Exec["ferm restart"];
         "/etc/logrotate.d/ulogd":
-            source => "puppet:///ferm/logrotate-ulogd",
+            source => "puppet:///modules/ferm/logrotate-ulogd",
             require => Package["logrotate"],
             ;
     }
@@ -73,7 +73,7 @@ class ferm {
         'true': {
             file {
                 "/etc/ferm/conf.d/load_ftp_conntrack.conf":
-                    source => "puppet:///ferm/conntrack_ftp.conf",
+                    source => "puppet:///modules/ferm/conntrack_ftp.conf",
                     require => Package["ferm"],
                     notify  => Exec["ferm restart"];
             }

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 0990a1a63d70f67715403385374140a852b1fb6e..ec082c385b0eb440b6338caee28317ce6dcc2d85 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -111,7 +111,7 @@ class ferm::per-host {
        cilea: {
             file {
                 "/etc/ferm/conf.d/load_sip_conntrack.conf":
-                    source => "puppet:///ferm/conntrack_sip.conf",
+                    source => "puppet:///modules/ferm/conntrack_sip.conf",
                     require => Package["ferm"],
                     notify  => Exec["ferm restart"];
             }

diff --git a/modules/kfreebsd/manifests/init.pp b/modules/kfreebsd/manifests/init.pp
index dff3b1a4fd8f0a1db1aa073bafa463df66bc8d10..00a7449cea946e4c27106e95e5d376343f40808f 100644 (file)
--- a/modules/kfreebsd/manifests/init.pp
+++ b/modules/kfreebsd/manifests/init.pp
@@ -1,7 +1,7 @@
 class kfreebsd {
     file {
         "/etc/cron.d/dsa-killruby":
-            source  => [ "puppet:///kfreebsd/dsa-killruby" ],
+            source  => [ "puppet:///modules/kfreebsd/dsa-killruby" ],
             ;
     }
     sysctl {

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 06f71a0ade5f71ad0f47080f068f7ba5dc0c7938..5e8da8c81937d1d22f5075e385dda7d29f77d806 100644 (file)
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -42,14 +42,14 @@ class monit {
           ;
 
         "/etc/monit/monit.d/01puppet":
-          source  => "puppet:///monit/puppet",
+          source  => "puppet:///modules/monit/puppet",
           require => Package["monit"],
           notify  => Exec["monit stop"],
           mode    => 440
           ;
 
         "/etc/monit/monit.d/00debian.org":
-          source  => "puppet:///monit/debianorg",
+          source  => "puppet:///modules/monit/debianorg",
           require => Package["monit"],
           notify  => Exec["monit stop"],
           mode    => 440

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index e16e20f850707f648b7e2ac3c93b64b5d40127e2..7393260ea08bec1d433e849a4435b88b4ae3fe80 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -6,16 +6,16 @@ class nagios::client inherits nagios {
 
        file {
                "/etc/default/nagios-nrpe-server":
-                       source  => [ "puppet:///nagios/per-host/$fqdn/default",
-                                    "puppet:///nagios/common/default" ],
+                       source  => [ "puppet:///modules/nagios/per-host/$fqdn/default",
+                                    "puppet:///modules/nagios/common/default" ],
                        require => Package["nagios-nrpe-server"],
                        notify  => Exec["nagios-nrpe-server restart"];
                "/etc/default/nagios-nrpe":
                        ensure  => absent,
                        notify  => Exec["nagios-nrpe-server restart"];
                "/etc/nagios/nrpe.cfg":
-                       source  => [ "puppet:///nagios/per-host/$fqdn/nrpe.cfg",
-                                    "puppet:///nagios/common/nrpe.cfg" ],
+                       source  => [ "puppet:///modules/nagios/per-host/$fqdn/nrpe.cfg",
+                                    "puppet:///modules/nagios/common/nrpe.cfg" ],
                        require => Package["nagios-nrpe-server"],
                        notify  => Exec["nagios-nrpe-server restart"];
                "/etc/nagios/nrpe.d":
@@ -27,13 +27,13 @@ class nagios::client inherits nagios {
                        require => Package["nagios-nrpe-server"],
                        notify  => Exec["nagios-nrpe-server restart"];
                "/etc/nagios/nrpe.d/nrpe_dsa.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
                        require => Package["dsa-nagios-checks"],
                        notify  => Exec["nagios-nrpe-server restart"];
 
                "/etc/nagios/obsolete-packages-ignore":
-                       source  => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore",
-                                    "puppet:///nagios/common/obsolete-packages-ignore" ],
+                       source  => [ "puppet:///modules/nagios/per-host/$fqdn/obsolete-packages-ignore",
+                                    "puppet:///modules/nagios/common/obsolete-packages-ignore" ],
                        require => Package["dsa-nagios-checks"];
 
                "/etc/nagios/obsolete-packages-ignore.d/hostspecific":

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 3ee3020d209b8cd2afb6ed28b7d62105023b4a34..6f90533c759e586e9934dd7e21f62bc7fc7ff9f4 100644 (file)
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -8,16 +8,16 @@ class nagios::server inherits nagios::client {
 
        file {
                "/etc/nagios-plugins/config/local-dsa-checkcommands.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/checkcommands.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/checkcommands.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
 
                "/etc/nagios3/cgi.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/cgi.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/cgi.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/nagios.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/nagios.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/nagios.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
 
@@ -27,48 +27,48 @@ class nagios::server inherits nagios::client {
                        ensure  => directory;
 
                "/etc/nagios3/puppetconf.d/contacts.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/contacts.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/contacts.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/generic-host.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-host.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-host.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/generic-service.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-service.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-service.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/timeperiods.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
 
                "/etc/nagios3/puppetconf.d/auto-dependencies.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-dependencies.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-dependencies.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/auto-hostgroups.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostgroups.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hostgroups.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/auto-hosts.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hosts.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hosts.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/auto-servicegroups.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-servicegroups.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-servicegroups.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/auto-services.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-services.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-services.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
 

diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index eadc515a0aaa7389ee32bfd281325cb0383d5c79..117cbf89380061807fe8dbc8361bd634d021b995 100644 (file)
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -10,7 +10,6 @@ when /(bellini|cimarosa).debian.org/:   ignore << "mcelog"
 when "busoni.debian.org":               ignore << %w{libthreads-perl libthreads-shared-perl}
 when "cilea.debian.org":                ignore << "/freeswitch.*/"
 when /draghi.debian.org/:               ignore << %w{userdir-ldap libnet-dns-perl libnet-dns-sec-perl libnet-dns-zone-parser-perl libdns-ruby1.8}
-when /geo[123].debian.org/:             ignore << %w{geoip-database libgeoip1 geoip-bin}
 when /liszt.debian.org/:                ignore << "amavisd-new"
 when /stabile.debian.org/:              ignore << "xfsprogs"
 when /(zandonai|zelenka).debian.org/:   ignore << %w{zabbix-agent rrdcollect}
@@ -23,7 +22,7 @@ when "zee.debian.org":                  ignore << %w{dpkg-dev dpkg}
 end
 
 case fqdn
-when /(draghi|orff|ravel|klecker).debian.org/: ignore << %w{libdns64 bind9 libbind9-60 liblwres60 bind9-host libisccfg60 libisc60 dnsutils bind9utils libisccc60}
+when /(draghi|orff|ravel|klecker|geo[123]).debian.org/: ignore << %w{libdns66 libdns64 bind9 libbind9-60 liblwres60 bind9-host libisccfg60 libisc60 dnsutils bind9utils libisccc60}
 end
 ignore.flatten.join("\n")
 %>

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index d8155cdf3d5c8791f1f3410825eb61a28cc7f4f0..76cfe3c6e7c4b3df68e002def746e8a1fa225cbc 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -12,16 +12,16 @@ class named::geodns inherits named {
             notify  => Exec["apt-get update"],
             ;
         "/etc/bind/named.conf.local":
-            source  => [ "puppet:///named/per-host/$fqdn/named.conf.local",
-                         "puppet:///named/common/named.conf.local" ],
+            source  => [ "puppet:///modules/named/per-host/$fqdn/named.conf.local",
+                         "puppet:///modules/named/common/named.conf.local" ],
             require => Package["bind9"],
             notify  => Exec["bind9 restart"],
             owner   => root,
             group   => root,
             ;
         "/etc/bind/named.conf.acl":
-            source  => [ "puppet:///named/per-host/$fqdn/named.conf.acl",
-                         "puppet:///named/common/named.conf.acl" ],
+            source  => [ "puppet:///modules/named/per-host/$fqdn/named.conf.acl",
+                         "puppet:///modules/named/common/named.conf.acl" ],
             require => Package["bind9"],
             notify  => Exec["bind9 restart"],
             owner   => root,
@@ -40,30 +40,30 @@ class named::geodns inherits named {
             mode    => 755,
             ;
         "/etc/bind/geodns/named.conf.geo":
-            source  => [ "puppet:///named/per-host/$fqdn/named.conf.geo",
-                         "puppet:///named/common/named.conf.geo" ],
+            source  => [ "puppet:///modules/named/per-host/$fqdn/named.conf.geo",
+                         "puppet:///modules/named/common/named.conf.geo" ],
             require => Package["bind9"],
             notify  => Exec["bind9 restart"],
             owner   => root,
             group   => root,
             ;
         "/etc/bind/geodns/trigger":
-            source  => [ "puppet:///named/per-host/$fqdn/trigger",
-                         "puppet:///named/common/trigger" ],
+            source  => [ "puppet:///modules/named/per-host/$fqdn/trigger",
+                         "puppet:///modules/named/common/trigger" ],
             owner   => root,
             group   => root,
             mode    => 555,
             ;
         "/etc/ssh/userkeys/geodnssync":
-            source  => [ "puppet:///named/per-host/$fqdn/authorized_keys",
-                         "puppet:///named/common/authorized_keys" ],
+            source  => [ "puppet:///modules/named/per-host/$fqdn/authorized_keys",
+                         "puppet:///modules/named/common/authorized_keys" ],
             owner   => root,
             group   => geodnssync,
             mode    => 440,
             ;
         "/etc/cron.d/dsa-boot-geodnssync":
-            source  => [ "puppet:///named/per-host/$fqdn/cron-geo",
-                         "puppet:///named/common/cron-geo" ],
+            source  => [ "puppet:///modules/named/per-host/$fqdn/cron-geo",
+                         "puppet:///modules/named/common/cron-geo" ],
             owner   => root,
             group   => root,
             ;

diff --git a/modules/named/manifests/secondary.pp b/modules/named/manifests/secondary.pp
index b08685259d64beed2dacc162ec631674885a7278..4f0494e2a898bf228d5fbb04f2cb9a01a07e478f 100644 (file)
--- a/modules/named/manifests/secondary.pp
+++ b/modules/named/manifests/secondary.pp
@@ -1,8 +1,8 @@
 class named::secondary inherits named {
     file {
         "/etc/bind/named.conf.debian-zones":
-            source  => [ "puppet:///named/per-host/$fqdn/named.conf.debian-zones",
-                         "puppet:///named/common/named.conf.debian-zones" ],
+            source  => [ "puppet:///modules/named/per-host/$fqdn/named.conf.debian-zones",
+                         "puppet:///modules/named/common/named.conf.debian-zones" ],
             notify  => Exec["bind9 reload"];
         "/etc/bind/named.conf.options":
             content => template("named/named.conf.options.erb"),

diff --git a/modules/nfs-server/manifests/init.pp b/modules/nfs-server/manifests/init.pp
index 9a2b92ff7242f4fa356bc8b3dd2b477ca6d7fed8..d14a6ca38661fab2c9b4d0f74b9f85e4e38a9f86 100644 (file)
--- a/modules/nfs-server/manifests/init.pp
+++ b/modules/nfs-server/manifests/init.pp
@@ -9,15 +9,15 @@ class nfs-server {
 
     file {
         "/etc/default/nfs-common":
-            source  => "puppet:///nfs-server/nfs-common.default",
+            source  => "puppet:///modules/nfs-server/nfs-common.default",
             require => Package["nfs-common"],
             notify  => Exec["nfs-common restart"];
         "/etc/default/nfs-kernel-server":
-            source  => "puppet:///nfs-server/nfs-kernel-server.default",
+            source  => "puppet:///modules/nfs-server/nfs-kernel-server.default",
             require => Package["nfs-kernel-server"],
             notify  => Exec["nfs-kernel-server restart"];
         "/etc/modprobe.d/lockd.local":
-            source  => "puppet:///nfs-server/lockd.local.modprobe";
+            source  => "puppet:///modules/nfs-server/lockd.local.modprobe";
     }
 
     exec {

diff --git a/modules/postgrey/manifests/init.pp b/modules/postgrey/manifests/init.pp
index 227655d3e0d5373876fab21e1f25e4ede01b1bc1..678665ee8a716353ffcf41b5aee6fb74d7d16dc3 100644 (file)
--- a/modules/postgrey/manifests/init.pp
+++ b/modules/postgrey/manifests/init.pp
@@ -3,7 +3,7 @@ class postgrey {
 
     file {
         "/etc/default/postgrey":
-          source  => "puppet:///postgrey/default",
+          source  => "puppet:///modules/postgrey/default",
           require => Package["postgrey"],
           notify  => Exec["postgrey restart"]
           ;

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 89c341f92a1e18252a1e3a0c5c298e66ad52600c..b3defd5ca8fcf7257030f678c888da7c06af2597 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -545,7 +545,7 @@ MailSeverity=crit
 PrintSeverity=none
 LogSeverity=info
 SyslogSeverity=alert
-ExportSeverity=none
+#ExportSeverity=none
 
 
 
@@ -612,7 +612,7 @@ ExportSeverity=none
 
 ## Switch on/off
 #
-KernelCheckActive = True
+#KernelCheckActive = True
 
 ## Check interval (seconds); btw., the check is VERY fast
 #
@@ -630,7 +630,7 @@ KernelCheckActive = True
 
 ## Switch on/off
 #
-LoginCheckActive = True
+# LoginCheckActive = True
 
 ## Severity for logins, multiple logins, logouts
 # 

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 98add73820e1f33154cb8361eed03c1f61812c61..271c8bdff6155c00a448f453ca4dbae244e52129 100644 (file)
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -5,7 +5,7 @@ class ssh {
         }
 
        file { "/etc/ssh/ssh_config":
-               source  => [ "puppet:///ssh/ssh_config" ],
+               source  => [ "puppet:///modules/ssh/ssh_config" ],
                require => Package["openssh-client"]
                 ;
               "/etc/ssh/sshd_config":

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 81bdb893ddb3f6829bc479caebb3d4b4eff9a63d..391da0a41622991f1d70c0143a00bdb115073656 100644 (file)
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -32,19 +32,19 @@ class ssl {
           source  => "puppet:///files/empty/"
         ;
         "/etc/ssl/debian/certs/thishost.crt":
-          source  => "puppet:///ssl/clientcerts/$fqdn.client.crt",
+          source  => "puppet:///modules/ssl/clientcerts/$fqdn.client.crt",
           notify  => Exec["c_rehash /etc/ssl/debian/certs"],
           ;
         "/etc/ssl/debian/keys/thishost.key":
-          source  => "puppet:///ssl/clientcerts/$fqdn.key",
+          source  => "puppet:///modules/ssl/clientcerts/$fqdn.key",
           mode    => 640
           ;
         "/etc/ssl/debian/certs/ca.crt":
-          source  => "puppet:///ssl/clientcerts/ca.crt",
+          source  => "puppet:///modules/ssl/clientcerts/ca.crt",
           notify  => Exec["c_rehash /etc/ssl/debian/certs"],
           ;
         "/etc/ssl/debian/crls/ca.crl":
-          source  => "puppet:///ssl/clientcerts/ca.crl",
+          source  => "puppet:///modules/ssl/clientcerts/ca.crl",
           ;
     }
 

diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp
index a3903573f229d58010dcf8e19b51ea7d67736269..d774a8f6c203aa5e95f039667625b8cae6029452 100644 (file)
--- a/modules/sudo/manifests/init.pp
+++ b/modules/sudo/manifests/init.pp
@@ -5,13 +5,13 @@ class sudo {
                owner   => root,
                group   => root,
                mode    => 440,
-               source  => [ "puppet:///sudo/per-host/$fqdn/sudoers",
-                            "puppet:///sudo/common/sudoers" ],
+               source  => [ "puppet:///modules/sudo/per-host/$fqdn/sudoers",
+                            "puppet:///modules/sudo/common/sudoers" ],
                require => Package["sudo"]
                 ;
               "/etc/pam.d/sudo":
-               source  => [ "puppet:///sudo/per-host/$fqdn/pam",
-                            "puppet:///sudo/common/pam" ],
+               source  => [ "puppet:///modules/sudo/per-host/$fqdn/pam",
+                            "puppet:///modules/sudo/common/pam" ],
                require => Package["sudo"]
                 ;