]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
whitespace nazi
authorStephen Gran <steve@lobefin.net>
Sun, 7 Mar 2010 12:36:47 +0000 (12:36 +0000)
committerStephen Gran <steve@lobefin.net>
Sun, 7 Mar 2010 12:36:47 +0000 (12:36 +0000)
Signed-off-by: Stephen Gran <steve@lobefin.net>
30 files changed:
modules/apache2/manifests/init.pp
modules/apache2/manifests/security_mirror.pp
modules/apt-keys/manifests/init.pp
modules/buildd/manifests/init.pp
modules/clamav/manifests/init.pp
modules/debian-org/manifests/init.pp
modules/exim/manifests/init.pp
modules/exim/manifests/mx.pp
modules/ferm/manifests/init.pp
modules/hosts/manifests/init.pp
modules/kfreebsd/manifests/init.pp
modules/monit/manifests/init.pp
modules/motd/manifests/init.pp
modules/munin-node/manifests/init.pp
modules/munin-node/manifests/master.pp
modules/nagios/manifests/client.pp
modules/nagios/manifests/init.pp
modules/nagios/manifests/server.pp
modules/named/manifests/geodns.pp
modules/named/manifests/init.pp
modules/named/manifests/recursor.pp
modules/named/manifests/secondary.pp
modules/ntp/manifests/init.pp
modules/portforwarder/manifests/init.pp
modules/postgrey/manifests/init.pp
modules/raidmpt/manifests/init.pp
modules/resolv/manifests/init.pp
modules/samhain/manifests/init.pp
modules/ssh/manifests/init.pp
modules/sudo/manifests/init.pp

index d75b970e3e64fb799b5af8c42533153c78968689..3084c11480806e6ec770fc965d7fd28641bed85a 100644 (file)
 class apache2 {
-        activate_munin_check {
-                "apache_accesses":;
-                "apache_processes":;
-                "apache_volume":;
-                "apache_servers":;
-                "ps_apache2": script => "ps_";
-        }
-
-       package {
-               "apache2": ensure => installed;
-               "logrotate": ensure => installed;
-       }
-
-        case $php5 {
-                "true": { package {
-                               "php5-suhosin": ensure => installed;
-                       }
-                          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" ],
-                                       require => Package["apache2", "php5-suhosin"],
-                                        notify  => Exec["force-reload-apache2"];
-                       }
-               }
-       }
+    activate_munin_check {
+        "apache_accesses":;
+        "apache_processes":;
+        "apache_volume":;
+        "apache_servers":;
+        "ps_apache2": script => "ps_";
+    }
 
+    package {
+        "apache2": ensure => installed;
+        "logrotate": ensure => installed;
+    }
 
-        define activate_apache_site($ensure=present, $site=$name) {
-                case $site {
-                        "": { $base = $name }
-                        default: { $base = $site }
-                }
+    case $php5 {
+        "true": {
+            package {
+                "php5-suhosin": ensure => installed;
+            }
 
-                case $ensure {
-                        present: {
-                                file { "/etc/apache2/sites-enabled/$name":
-                                         ensure => "/etc/apache2/sites-available/$base",
-                                         require => Package["apache2"],
-                                         notify => Exec["reload-apache2"];
-                                }
-                        }
-                        absent: {
-                                file { "/etc/apache2/sites-enabled/$name":
-                                         ensure => $ensure,
-                                         notify => Exec["reload-apache2"];
-                                }
-                        }
-                       default: { err ( "Unknown ensure value: '$ensure'" ) }
-                }
+            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" ],
+                require => Package["apache2", "php5-suhosin"],
+                notify  => Exec["force-reload-apache2"];
+            }
         }
+    }
 
-       define enable_module($ensure=present) {
-               case $ensure {
-                       present: {
-                               exec { "/usr/sbin/a2enmod $name":
-                                       unless => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]'",
-                                       notify => Exec["force-reload-apache2"],
-                               }
-                       }
-                       absent: {
-                               exec { "/usr/sbin/a2dismod $name":
-                                       onlyif => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]'",
-                                       notify => Exec["force-reload-apache2"],
-                               }
-                       }
-                       default: { err ( "Unknown ensure value: '$ensure'" ) }
-                }
-       }
+    define activate_apache_site($ensure=present, $site=$name) {
+        case $site {
+            "": { $base = $name }
+            default: { $base = $site }
+        }
 
-        enable_module {
-                "info":;
-                "status":;
+        case $ensure {
+            present: {
+                    file { "/etc/apache2/sites-enabled/$name":
+                             ensure => "/etc/apache2/sites-available/$base",
+                             require => Package["apache2"],
+                             notify => Exec["reload-apache2"];
+                    }
+            }
+            absent: {
+                    file { "/etc/apache2/sites-enabled/$name":
+                             ensure => $ensure,
+                             notify => Exec["reload-apache2"];
+                    }
+            }
+            default: { err ( "Unknown ensure value: '$ensure'" ) }
         }
+    }
 
-        activate_apache_site {
-                "00-default": site => "default-debian.org";
-                "000-default": ensure => absent;
+    define enable_module($ensure=present) {
+        case $ensure {
+            present: {
+                exec { 
+                      "/usr/sbin/a2enmod $name":
+                        unless => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]'",
+                        notify => Exec["force-reload-apache2"],
+                }
+            }
+            absent: {
+                exec {
+                      "/usr/sbin/a2dismod $name":
+                        onlyif => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]'",
+                        notify => Exec["force-reload-apache2"],
+                }
+            }
+            default: { err ( "Unknown ensure value: '$ensure'" ) }
         }
+    }
 
-       file {
-               "/etc/apache2/conf.d/ressource-limits":
-                       content => template("apache2/ressource-limits.erb"),
-                       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" ],
-                       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" ],
-                       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" ],
-                       require => Package["apache2"],
-                        notify  => Exec["reload-apache2"];
+    enable_module {
+        "info":;
+        "status":;
+    }
+
+    activate_apache_site {
+        "00-default": site => "default-debian.org";
+        "000-default": ensure => absent;
+    }
 
-               "/etc/apache2/sites-available/default-debian.org":
-                       content => template("apache2/default-debian.org.erb"),
-                       require => Package["apache2"],
+    file {
+        "/etc/apache2/conf.d/ressource-limits":
+            content => template("apache2/ressource-limits.erb"),
+            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" ],
+            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" ],
+            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" ],
+            require => Package["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" ];
+        "/etc/apache2/sites-available/default-debian.org":
+            content => template("apache2/default-debian.org.erb"),
+            require => Package["apache2"],
+            notify  => Exec["reload-apache2"];
 
-               "/srv/www":
-                       mode    => 755,
-                       ensure  => directory;
-               "/srv/www/default.debian.org":
-                       mode    => 755,
-                       ensure  => directory;
-               "/srv/www/default.debian.org/htdocs":
-                       mode    => 755,
-                       ensure  => directory;
-               "/srv/www/default.debian.org/htdocs/index.html":
-                       content => template("apache2/default-index.html");
+        "/etc/logrotate.d/apache2":
+            source  => [ "puppet:///apache2/per-host/$fqdn/etc/logrotate.d/apache2",
+                         "puppet:///apache2/common/etc/logrotate.d/apache2" ];
 
-               # sometimes this is a symlink
-               #"/var/log/apache2":
-               #       mode    => 755,
-               #       ensure  => directory;
-       }
+        "/srv/www":
+            mode    => 755,
+            ensure  => directory;
+        "/srv/www/default.debian.org":
+            mode    => 755,
+            ensure  => directory;
+        "/srv/www/default.debian.org/htdocs":
+            mode    => 755,
+            ensure  => directory;
+        "/srv/www/default.debian.org/htdocs/index.html":
+            content => template("apache2/default-index.html");
 
-       exec { "reload-apache2":
-               command => "/etc/init.d/apache2 reload",
-               refreshonly => true,
-        }
+        # sometimes this is a symlink
+        #"/var/log/apache2":
+        #    mode    => 755,
+        #    ensure  => directory;
+    }
 
-        exec { "force-reload-apache2":
-               command => "/etc/init.d/apache2 force-reload",
-               refreshonly => true,
-       }
-        @ferm::rule { "dsa-http-limit":
-                prio            => "20",
-                description     => "limit HTTP DOS",
-                rule            => "chain 'http_limit' { mod limit limit-burst 60 limit 15/minute jump ACCEPT; jump DROP; }"
-        }
-        @ferm::rule { "dsa-http-soso":
-                prio            => "21",
-                description     => "slow yahoo spider",
-                rule            => "chain 'limit_sosospider' { mod connlimit connlimit-above 2 connlimit-mask 21 jump DROP; jump http_limit; }"
-        }
-        @ferm::rule { "dsa-http-yahoo":
-                prio            => "21",
-                description     => "slow yahoo spider",
-                rule            => "chain 'limit_yahoo' { mod connlimit connlimit-above 2 connlimit-mask 16 jump DROP; jump http_limit; }"
-        }
-        @ferm::rule { "dsa-http-rules":
-                prio            => "22",
-                description     => "http subchain",
-                rule            => "chain 'http' { saddr ( 74.6.22.182 74.6.18.240 ) jump limit_yahoo; saddr 124.115.0.0/21 jump limit_sosospider; 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; mod recent name HTTPDOS set jump log_or_drop; }"
-        }
-        @ferm::rule { "dsa-http":
-                prio            => "23",
-                description     => "Allow web access",
-                rule            => "proto tcp dport http jump http;"
-        }
-        @ferm::rule { "dsa-http-v6":
-                domain          => "(ip6)",
-                prio            => "23",
-                description     => "Allow web access",
-                rule            => "&SERVICE(tcp, 80)"
-        }
+    exec {
+        "reload-apache2":
+            command => "/etc/init.d/apache2 reload",
+            refreshonly => true;
+        "force-reload-apache2":
+            command => "/etc/init.d/apache2 force-reload",
+            refreshonly => true;
+    }
+
+    @ferm::rule { "dsa-http-limit":
+        prio            => "20",
+        description     => "limit HTTP DOS",
+        rule            => "chain 'http_limit' { mod limit limit-burst 60 limit 15/minute jump ACCEPT; jump DROP; }"
+    }
+    @ferm::rule { "dsa-http-soso":
+        prio            => "21",
+        description     => "slow yahoo spider",
+        rule            => "chain 'limit_sosospider' { mod connlimit connlimit-above 2 connlimit-mask 21 jump DROP; jump http_limit; }"
+    }
+    @ferm::rule { "dsa-http-yahoo":
+        prio            => "21",
+        description     => "slow yahoo spider",
+        rule            => "chain 'limit_yahoo' { mod connlimit connlimit-above 2 connlimit-mask 16 jump DROP; jump http_limit; }"
+    }
+    @ferm::rule { "dsa-http-rules":
+        prio            => "22",
+        description     => "http subchain",
+        rule            => "chain 'http' { saddr ( 74.6.22.182 74.6.18.240 ) jump limit_yahoo; saddr 124.115.0.0/21 jump limit_sosospider; 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; mod recent name HTTPDOS set jump log_or_drop; }"
+    }
+    @ferm::rule { "dsa-http":
+        prio            => "23",
+        description     => "Allow web access",
+        rule            => "proto tcp dport http jump http;"
+    }
+    @ferm::rule { "dsa-http-v6":
+        domain          => "(ip6)",
+        prio            => "23",
+        description     => "Allow web access",
+        rule            => "&SERVICE(tcp, 80)"
+    }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 85adcf1de49b788c19ca3205a97f944970aa0ea3..bdc3bcce1504ea737475595b51a3e5fc98066765 100644 (file)
@@ -1,15 +1,18 @@
 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" ];
+    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" ];
 
-       }
+    }
 
-       activate_apache_site {
-               "010-security.debian.org": site => "security.debian.org";
-               "security.debian.org": ensure => absent;
-       }
+    activate_apache_site {
+        "010-security.debian.org": site => "security.debian.org";
+        "security.debian.org": ensure => absent;
+    }
 
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 92966b9425df94da752f500bdf888dd47d8c2fa5..df61688131af84a08d46f429d0eaf5575bb89b88 100644 (file)
@@ -1,21 +1,21 @@
 class apt-keys {
     file {
         "/etc/apt/trusted-keys.d/":
-          ensure  => directory,
-          purge   => true,
-          notify  => Exec["apt-keys-update"],
-          ;
+            ensure  => directory,
+            purge   => true,
+            notify  => Exec["apt-keys-update"],
+            ;
 
         "/etc/apt/trusted-keys.d/backports.org.asc":
-          source  => "puppet:///apt-keys/backports.org.asc",
-          mode    => 664,
-          notify  => Exec["apt-keys-update"],
-          ;
+            source  => "puppet:///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",
-          mode    => 664,
-          notify  => Exec["apt-keys-update"],
-          ;
+            source  => "puppet:///apt-keys/db.debian.org.asc",
+            mode    => 664,
+            notify  => Exec["apt-keys-update"],
+            ;
     }
 
     exec { "apt-keys-update":
@@ -24,3 +24,6 @@ class apt-keys {
     }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 7ddd769c75fdfbbbbcaf172cae6fa3e07e15ec3a..16f844155a332d74bb0164ebbd8f0a907514d5e0 100644 (file)
@@ -1,31 +1,34 @@
 class buildd {
-   package {
-     "sbuild": ensure => installed;
-     "buildd": ensure => installed;
-     "buildd-builder-meta": ensure => installed;
-     "apt-transport-https": ensure => installed;
-     "debootstrap": ensure => installed;
-   }
-
-   file {
-      "/etc/apt/sources.list.d/buildd.list":
+    package {
+        "sbuild": ensure => installed;
+        "buildd": ensure => installed;
+        "buildd-builder-meta": ensure => installed;
+        "apt-transport-https": ensure => installed;
+        "debootstrap": ensure => installed;
+    }
+   
+    file {
+        "/etc/apt/sources.list.d/buildd.list":
              content => template("buildd/etc/apt/sources.list.d/buildd.list.erb"),
              require => Package["apt-transport-https"],
              notify  => Exec["apt-get update"],
              ;
-
-      "/etc/apt/trusted-keys.d/buildd.debian.org.asc":
-            source  => "puppet:///buildd/buildd.debian.org.asc",
-            mode    => 664,
-            notify  => Exec["apt-keys-update"],
-            ;
-      "/etc/schroot/mount-defaults":
-            source  => "puppet:///buildd/mount-defaults",
-            require => Package["sbuild"]
-            ;
-      "/etc/cron.d/dsa-buildd":
-            source => "puppet:///buildd/cron.d-dsa-buildd",
-            require => Package["cron"]
-            ;
-   }
+       
+        "/etc/apt/trusted-keys.d/buildd.debian.org.asc":
+             source  => "puppet:///buildd/buildd.debian.org.asc",
+             mode    => 664,
+             notify  => Exec["apt-keys-update"],
+             ;
+        "/etc/schroot/mount-defaults":
+             source  => "puppet:///buildd/mount-defaults",
+             require => Package["sbuild"]
+             ;
+        "/etc/cron.d/dsa-buildd":
+             source => "puppet:///buildd/cron.d-dsa-buildd",
+             require => Package["cron"]
+             ;
+    }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index fa7e17ecf85425f11ff01391a7c0cbefb3ca54bc..6f42e1ac5a0411b137833c4e180cfad71d693087 100644 (file)
@@ -1,17 +1,21 @@
 class clamav {
-    package { "clamav-daemon": ensure => installed;
-              "clamav-freshclam": ensure => installed;
-              "clamav-unofficial-sigs": ensure => installed;
+    package {
+        "clamav-daemon": ensure => installed;
+        "clamav-freshclam": ensure => installed;
+        "clamav-unofficial-sigs": ensure => installed;
     }
     file {
         "/etc/clamav-unofficial-sigs.dsa.conf":
-          require => Package["clamav-unofficial-sigs"],
-          source  => [ "puppet:///clamav/clamav-unofficial-sigs.dsa.conf" ]
-          ;
+            require => Package["clamav-unofficial-sigs"],
+            source  => [ "puppet:///clamav/clamav-unofficial-sigs.dsa.conf" ]
+            ;
         "/etc/clamav-unofficial-sigs.conf":
-          require => Package["clamav-unofficial-sigs"],
-          source  => [ "puppet:///clamav/clamav-unofficial-sigs.conf" ]
-          ;
+            require => Package["clamav-unofficial-sigs"],
+            source  => [ "puppet:///clamav/clamav-unofficial-sigs.conf" ]
+            ;
     }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 3042b183e46f87a4350298c9c2123077f140bb89..e8196a70008c96d191adb92f275cdb0d6258536f 100644 (file)
 define sysctl($key, $value, $ensure=present) {
-    file { "/etc/sysctl.d/$name.conf":
-        ensure  => $ensure,
-        owner   => root,
-        group   => root,
-        mode    => 0644,
-        content => "$key = $value\n",
-        notify  => Exec["procps restart"],
+    file {
+        "/etc/sysctl.d/$name.conf":
+            ensure  => $ensure,
+            owner   => root,
+            group   => root,
+            mode    => 0644,
+            content => "$key = $value\n",
+            notify  => Exec["procps restart"],
     }
 }
 
 define set_alternatives($linkto) {
-        exec { "/usr/sbin/update-alternatives --set $name $linkto":
+    exec {
+        "/usr/sbin/update-alternatives --set $name $linkto":
             unless => "/bin/sh -c '! [ -e $linkto ] || ! [ -e /etc/alternatives/$name ] || ([ -L /etc/alternatives/$name ] && [ /etc/alternatives/$name -ef $linkto ])'"
         }
 }
 
 
 class debian-org {
-
-   package { "userdir-ldap": ensure => installed;
-             "zsh": ensure => installed;
-             "cron": ensure => installed;
-             "apt-utils": ensure => installed;
-             "tcsh": ensure => installed;
-             "pdksh": ensure => installed;
-             "ksh": ensure => installed;
-             "csh": ensure => installed;
-             "locales-all": ensure => installed;
-             "libpam-pwdfile": ensure => installed;
-             "vim": ensure => installed;
-             "gnupg": ensure => installed;
-             "bzip2": ensure => installed;
-             "less": ensure => installed;
-             "ed": ensure => installed;
-             "puppet": ensure => installed;
-             "mtr-tiny": ensure => installed;
-             "nload": ensure => installed;
-             "pciutils": ensure => installed;
-             "dnsutils": ensure => installed;
-             "bash-completion": ensure => installed;
-             "libfilesystem-ruby1.8": ensure => installed;
-             "syslog-ng": ensure => installed;
-             "sysklogd": ensure => purged;
-             "klogd": ensure => purged;
-             "rsyslog": ensure => purged;
-   }
-   file {
-      "/etc/apt/preferences":
-             source => "puppet:///files/etc/apt/preferences";
-      "/etc/apt/sources.list.d/backports.org.list":
-             content => template("debian-org/etc/apt/sources.list.d/backports.org.list.erb"),
-             notify  => Exec["apt-get update"];
-      "/etc/apt/sources.list.d/debian.org.list":
-             content => template("debian-org/etc/apt/sources.list.d/debian.org.list.erb"),
-             notify  => Exec["apt-get update"];
-      "/etc/apt/sources.list.d/security.list":
-             content => template("debian-org/etc/apt/sources.list.d/security.list.erb"),
-             notify  => Exec["apt-get update"];
-      "/etc/apt/sources.list.d/volatile.list":
-             content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
-             notify  => Exec["apt-get update"];
-      "/etc/apt/apt.conf.d/local-recommends":
-             source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
-      "/etc/apt/apt.conf.d/local-pdiffs":
-             source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs";
-      "/etc/timezone":
-             source => "puppet:///files/etc/timezone",
-             notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
-      "/etc/puppet/puppet.conf":
-             require => Package["puppet"],
-             source => "puppet:///files/etc/puppet/puppet.conf"
-             ;
-      "/etc/default/puppet":
-             require => Package["puppet"],
-             source => "puppet:///files/etc/default/puppet"
-             ;
-
-      "/etc/syslog-ng/syslog-ng.conf":
-             content => template("syslog-ng.conf.erb"),
-             require => Package["syslog-ng"],
-             notify  => Exec["syslog-ng reload"],
-             ;
-      "/etc/logrotate.d/syslog-ng":
-             require => Package["syslog-ng"],
-             source => "puppet:///files/etc/logrotate.d/syslog-ng",
-             ;
-      "/etc/cron.d/dsa-puppet-stuff":
-             source => "puppet:///files/etc/cron.d/dsa-puppet-stuff",
-             require => Package["cron"]
-             ;
-      "/etc/ldap/ldap.conf":
-             require => Package["userdir-ldap"],
-             source => "puppet:///files/etc/ldap/ldap.conf",
-             ;
-      "/etc/pam.d/common-session":
-             require => Package["libpam-pwdfile"],
-             source => "puppet:///files/etc/pam.d/common-session",
-             ;
-   }
-   case $hostname {
+    package {
+        "userdir-ldap": ensure => installed;
+        "zsh": ensure => installed;
+        "cron": ensure => installed;
+        "apt-utils": ensure => installed;
+        "tcsh": ensure => installed;
+        "pdksh": ensure => installed;
+        "ksh": ensure => installed;
+        "csh": ensure => installed;
+        "locales-all": ensure => installed;
+        "libpam-pwdfile": ensure => installed;
+        "vim": ensure => installed;
+        "gnupg": ensure => installed;
+        "bzip2": ensure => installed;
+        "less": ensure => installed;
+        "ed": ensure => installed;
+        "puppet": ensure => installed;
+        "mtr-tiny": ensure => installed;
+        "nload": ensure => installed;
+        "pciutils": ensure => installed;
+        "dnsutils": ensure => installed;
+        "bash-completion": ensure => installed;
+        "libfilesystem-ruby1.8": ensure => installed;
+        "syslog-ng": ensure => installed;
+        "sysklogd": ensure => purged;
+        "klogd": ensure => purged;
+        "rsyslog": ensure => purged;
+    }
+    file {
+        "/etc/apt/preferences":
+            source => "puppet:///files/etc/apt/preferences";
+        "/etc/apt/sources.list.d/backports.org.list":
+            content => template("debian-org/etc/apt/sources.list.d/backports.org.list.erb"),
+            notify  => Exec["apt-get update"];
+        "/etc/apt/sources.list.d/debian.org.list":
+            content => template("debian-org/etc/apt/sources.list.d/debian.org.list.erb"),
+            notify  => Exec["apt-get update"];
+        "/etc/apt/sources.list.d/security.list":
+            content => template("debian-org/etc/apt/sources.list.d/security.list.erb"),
+            notify  => Exec["apt-get update"];
+        "/etc/apt/sources.list.d/volatile.list":
+            content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
+            notify  => Exec["apt-get update"];
+        "/etc/apt/apt.conf.d/local-recommends":
+            source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
+        "/etc/apt/apt.conf.d/local-pdiffs":
+            source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs";
+        "/etc/timezone":
+            source => "puppet:///files/etc/timezone",
+            notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
+        "/etc/puppet/puppet.conf":
+            require => Package["puppet"],
+            source => "puppet:///files/etc/puppet/puppet.conf"
+            ;
+        "/etc/default/puppet":
+            require => Package["puppet"],
+            source => "puppet:///files/etc/default/puppet"
+            ;
+       
+        "/etc/syslog-ng/syslog-ng.conf":
+            content => template("syslog-ng.conf.erb"),
+            require => Package["syslog-ng"],
+            notify  => Exec["syslog-ng reload"],
+            ;
+        "/etc/logrotate.d/syslog-ng":
+            require => Package["syslog-ng"],
+            source => "puppet:///files/etc/logrotate.d/syslog-ng",
+            ;
+        "/etc/cron.d/dsa-puppet-stuff":
+            source => "puppet:///files/etc/cron.d/dsa-puppet-stuff",
+            require => Package["cron"]
+            ;
+        "/etc/ldap/ldap.conf":
+            require => Package["userdir-ldap"],
+            source => "puppet:///files/etc/ldap/ldap.conf",
+            ;
+        "/etc/pam.d/common-session":
+            require => Package["libpam-pwdfile"],
+            source => "puppet:///files/etc/pam.d/common-session",
+            ;
+    }
+    case $hostname {
         handel: {
             file {
-               "/etc/puppet/lib":
-                      ensure  => directory,
-                      source => "puppet:///files/etc/puppet/lib",
-                      recurse => true,
-                      notify  => Exec["puppetmaster restart"];
-            }
-        }
-        default: {}
-   }
-
-   # set mmap_min_addr to 4096 to mitigate
-   # Linux NULL-pointer dereference exploits
-   sysctl { "mmap_min_addr" :
-             key         => "vm.mmap_min_addr",
-             value       => 4096,
-   }
-
-   set_alternatives { "editor":
-           linkto => "/usr/bin/vim.basic",
-   }
-
-   exec { "syslog-ng reload":
-             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-             refreshonly => true,
-   }
-   exec { "dpkg-reconfigure tzdata -pcritical -fnoninteractive":
-           path        => "/usr/bin:/usr/sbin:/bin:/sbin",
-           refreshonly => true,
-   }
-   exec { "apt-get update":
-             command => 'apt-get update',
-             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-             refreshonly => true
-   }
-   exec { "puppetmaster restart":
-             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-             refreshonly => true,
-   }
-   exec { "procps restart":
-             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-             refreshonly => true,
-   }
+                "/etc/puppet/lib":
+                    ensure  => directory,
+                    source => "puppet:///files/etc/puppet/lib",
+                    recurse => true,
+                    notify  => Exec["puppetmaster restart"];
+             }
+         }
+    }
+   
+    # set mmap_min_addr to 4096 to mitigate
+    # Linux NULL-pointer dereference exploits
+    sysctl {
+        "mmap_min_addr" :
+            key         => "vm.mmap_min_addr",
+            value       => 4096,
+    }
+   
+    set_alternatives {
+        "editor":
+            linkto => "/usr/bin/vim.basic",
+    }
+   
+    exec {
+        "syslog-ng reload":
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true;
+        "dpkg-reconfigure tzdata -pcritical -fnoninteractive":
+            path        => "/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true;
+        "apt-get update":
+            command => 'apt-get update',
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true;
+        "puppetmaster restart":
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true;
+        "procps restart":
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true;
+    }
 }
 
 class debian-proliant inherits debian-org {
-   package {
-      "hpacucli": ensure => installed;
-      "hp-health": ensure => installed;
-      "cpqarrayd": ensure => installed;
-      "arrayprobe": ensure => installed;
-   }
-   case $debarchitecture {
-      "amd64": {
-         package { "lib32gcc1": ensure => installed; }
-      }
-   }
-   file {
-      "/etc/apt/sources.list.d/debian.restricted.list":
-             content => template("debian-org/etc/apt/sources.list.d/debian.restricted.list.erb"),
-             notify  => Exec["apt-get update"];
-   }
+    package {
+        "hpacucli": ensure => installed;
+        "hp-health": ensure => installed;
+        "cpqarrayd": ensure => installed;
+        "arrayprobe": ensure => installed;
+    }
+    case $debarchitecture {
+        "amd64": {
+            package { "lib32gcc1": ensure => installed; }
+        }
+    }
+    file {
+        "/etc/apt/sources.list.d/debian.restricted.list":
+            content => template("debian-org/etc/apt/sources.list.d/debian.restricted.list.erb"),
+            notify  => Exec["apt-get update"];
+    }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 171e453fc4e5edaf0f2f936326cec7deceabc930..451ae764f5e9567f269578bedaf98042d776a3f8 100644 (file)
@@ -180,3 +180,6 @@ class exim {
             rule            => "&SERVICE(tcp, 113)"
     }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index ebcbd852706e03d5be4b8c7741d132fd03daa217..3909f9b7ed366e918ab3802517aee1b711de069a 100644 (file)
@@ -32,3 +32,6 @@ class exim::mx inherits exim {
     }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index b997d60899012e86fbaf05e51e8e8fd14db8af09..05c5f798358c946bc265c4b15bbb498478683f28 100644 (file)
@@ -67,3 +67,6 @@ class ferm {
         }
 
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 279da0f48842ea3db8bee3513060682b7d145970..cdd1901713415ba86457ce2af1fa72ba9ca56bde 100644 (file)
@@ -5,3 +5,6 @@ class hosts {
     }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 37d3afa09ced2e328ba218548ff9edf1d129f2dc..686ba16732fa56f0c5f871178da0d8d8996bebd0 100644 (file)
@@ -6,5 +6,5 @@ class kfreebsd {
     }
 }
 # vim:set et:
-# vim:set ts=4:
+# vim:set sts=4 ts=4:
 # vim:set shiftwidth=4:
index b7e909d1cebd3b8f7345a36c9722182eb815ed5b..cad4319d73b5a9764258fdab90e178767c3d290f 100644 (file)
@@ -51,3 +51,6 @@ class monit {
     }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index a8d35a550569e72453824e52caccaeba7b99997a..0de4936028982dcef035393442d4fe724e922ba0 100644 (file)
@@ -10,3 +10,6 @@ class motd {
                 refreshonly => true
         }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 59fe205abfa59e1a1c11b0b82df4dd3a0e268114..cde57774f82322e39bd06999c820feb66e055d3a 100644 (file)
@@ -91,3 +91,6 @@ class munin-node {
     }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index cff2941ddee7953c7dbe59d88937c5955a3f1631..234188910cf561ac8fc3dac70a1f6dd88d30a797 100644 (file)
@@ -9,3 +9,6 @@ class munin-node::master inherits munin-node {
     }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 85c471fc9bde87555868f39fcbd79582828f1a1f..e16e20f850707f648b7e2ac3c93b64b5d40127e2 100644 (file)
@@ -55,3 +55,6 @@ class nagios::client inherits nagios {
                 rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS_V6) ACCEPT; }"
         }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 13c0dc911bf2a7b4aed742776bfd5941adee7151..4975a413456df667b85a5f7b60a8d4a92050fa77 100644 (file)
@@ -3,3 +3,6 @@ class nagios {
                nagios-nrpe-server: ensure => installed;
        }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 5cdbc43be8f111af0d63948034d3316600348b34..3ee3020d209b8cd2afb6ed28b7d62105023b4a34 100644 (file)
@@ -79,3 +79,6 @@ class nagios::server inherits nagios::client {
                refreshonly => true,
        }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 766c5e55faff2410c776a261338d17dabee670a5..ad2ed67d06f989ae880cc9ea526eaa57c1fbc83a 100644 (file)
@@ -71,4 +71,6 @@ class named::geodns inherits named {
         }
 }
 
-# vim: set fdm=marker ts=8 sw=8 et:
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index b5233758f7d6fd30a6f7927440d3241168cdbe09..1a22154d6c5763d168872a8825fc19a820fc3070 100644 (file)
@@ -34,4 +34,6 @@ class named {
         }
 }
 
-# vim: set fdm=marker ts=8 sw=8 et:
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 61ca459c6d79f6c703ff2f0468b448bb545b3c5d..2fc192af2b0cb68bdd6e308f0d6b127b7c58a9a1 100644 (file)
@@ -6,3 +6,6 @@ class named::recursor inherits named {
 }
 
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 87f3d377e7c91badd8e2c6e1e2b3fdee50397217..582fbea7fdb2b88bac07ad881e6d947e7ff24342 100644 (file)
@@ -15,3 +15,6 @@ class named::secondary inherits named {
     }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index af086f6849edc5621f6c8d2fc621e3c7357c8af5..dfc1517906ef3a1b01877a89e95e868a02d5f5e7 100644 (file)
@@ -31,3 +31,6 @@ class ntp {
                 rule            => "&SERVICE(udp, 123)"
         }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 882bb270837496c3b0dac9cf4b461c66b0997a1b..83d11cf6b372c8b6dabc3672f08d3de9a9239022 100644 (file)
@@ -26,5 +26,5 @@ class portforwarder {
     }
 }
 # vim:set et:
-# vim:set ts=4:
+# vim:set sts=4 ts=4:
 # vim:set shiftwidth=4:
index bc42e865c67baafae31fad49c21e4994e26aa237..227655d3e0d5373876fab21e1f25e4ede01b1bc1 100644 (file)
@@ -14,3 +14,6 @@ class postgrey {
         refreshonly => true,
     }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index e04cd2f4984b66c81c70a7d1a62ea2cc3b0b9b94..814fd5b405467886c63e29401309046a54260a0e 100644 (file)
@@ -17,5 +17,5 @@ class raidmpt {
     }
 }
 # vim:set et:
-# vim:set ts=4:
+# vim:set sts=4 ts=4:
 # vim:set shiftwidth=4:
index e812423164235d3fe3ea7a74fad597e4c12217cd..1934cfa1c4be63a1a462385474a2fbb390ad5fc3 100644 (file)
@@ -3,3 +3,6 @@ class resolv {
                        content => template("resolv/resolv.conf.erb");
        }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 54fd06ff1dc94a1550624c522f30babf88ba6028..f32a96bf79baa75aac8acb696686debc5b61d162 100644 (file)
@@ -13,4 +13,7 @@ class samhain {
         refreshonly => true,
     }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
 
index 9d272a224c80efed8437ac61407979210c86ffac..98add73820e1f33154cb8361eed03c1f61812c61 100644 (file)
@@ -41,3 +41,6 @@ class ssh {
                 rule            => "&SERVICE_RANGE(tcp, ssh, \$SSH_V6_SOURCES)"
         }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
index 9e1024ce0188b694451d10b436057e40fe09755c..a3903573f229d58010dcf8e19b51ea7d67736269 100644 (file)
@@ -17,3 +17,6 @@ class sudo {
 
        }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: