X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=30998c35b35bf4928a1ebcf19a4c418156f57bd4;hb=3eb533e5499e66423bafdedaf6c7d08ead1772de;hp=bed7a84b7305791de39fdf549401eefa6d8ef16a;hpb=82b1041c8420f1bacd24edcc938dac995e3658d3;p=dsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index bed7a84b..30998c35 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,164 +1,168 @@
-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"],
-    }
-}
+class debian-org {
 
-define set_alternatives($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 ])'"
-        }
-}
+	$debianadmin = [
+		'debian-archive-debian-samhain-reports@master.debian.org',
+		'debian-admin@ftbfs.de',
+		'weasel@debian.org',
+		'steve@lobefin.net',
+		'paravoid@debian.org'
+	]
 
+	package { [
+			'apt-utils',
+			'bash-completion',
+			'debian.org',
+			'dnsutils',
+			'dsa-munin-plugins',
+			'klogd',
+			'less',
+			'lsb-release',
+			'libfilesystem-ruby1.8',
+			'molly-guard',
+			'mtr-tiny',
+			'nload',
+			'pciutils',
+			'rsyslog',
+			'sysklogd',
+		]:
+			ensure => installed,
+	}
 
-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"
-             ;
+	munin::check { [
+			'cpu',
+			'entropy',
+			'forks',
+			'interrupts',
+			'iostat',
+			'irqstats',
+			'load',
+			'memory',
+			'ntp_offset',
+			'ntp_states',
+			'open_files',
+			'open_inodes',
+			'processes',
+			'swap',
+			'uptime',
+			'vmstat',
+		]:
+	}
 
-      "/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: {}
-   }
+	if getfromhash($site::nodeinfo, 'broken-rtc') {
+		package { 'fake-hwclock':
+			ensure => installed
+		}
+	}
 
-   # set mmap_min_addr to 4096 to mitigate
-   # Linux NULL-pointer dereference exploits
-   sysctl { "mmap_min_addr" :
-             key         => "vm.mmap_min_addr",
-             value       => 4096,
-   }
+	# This really means 'not wheezy'
 
-   set_alternatives { "editor":
-           linkto => "/usr/bin/vim.basic",
-   }
+	if $::debarchitecture != 'armhf' {
+		site::aptrepo { 'security':
+			template => 'debian-org/etc/apt/sources.list.d/security.list.erb',
+		}
+		site::aptrepo { 'backports.org':
+			template => 'debian-org/etc/apt/sources.list.d/backports.org.list.erb',
+			key      => 'puppet:///modules/debian-org/backports.org.asc',
+		}
+		site::aptrepo { 'volatile':
+			template => 'debian-org/etc/apt/sources.list.d/volatile.list.erb',
+		}
+	}
 
-   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,
-   }
-}
+	site::aptrepo { 'debian.org':
+		template => 'debian-org/etc/apt/sources.list.d/debian.org.list.erb',
+		key      => 'puppet:///modules/debian-org/db.debian.org.asc',
+	}
+
+	file { '/etc/apt/preferences':
+		source => 'puppet:///modules/debian-org/apt.preferences',
+	}
+	file { '/etc/apt/trusted-keys.d/':
+		ensure => directory,
+		purge  => true,
+	}
+	file { '/etc/apt/apt.conf.d/local-compression':
+		source => 'puppet:///modules/debian-org/apt.conf.d/local-compression',
+	}
+	file { '/etc/apt/apt.conf.d/local-recommends':
+		source => 'puppet:///modules/debian-org/apt.conf.d/local-recommends',
+	}
+	file { '/etc/apt/apt.conf.d/local-pdiffs':
+		source => 'puppet:///modules/debian-org/apt.conf.d/local-pdiffs',
+	}
+	file { '/etc/timezone':
+		source => 'puppet:///modules/debian-org/timezone',
+		notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
+	}
+	file { '/etc/puppet/puppet.conf':
+		source => 'puppet:///modules/debian-org/puppet.conf',
+	}
+	file { '/etc/default/puppet':
+		source => 'puppet:///modules/debian-org/puppet.default',
+	}
+	file { '/etc/cron.d/dsa-puppet-stuff':
+		source => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
+		require => Package['debian.org'],
+	}
+	file { '/etc/ldap/ldap.conf':
+		require => Package['debian.org'],
+		source => 'puppet:///modules/debian-org/ldap.conf',
+	}
+	file { '/etc/pam.d/common-session':
+		require => Package['debian.org'],
+		content => template('debian-org/pam.common-session.erb'),
+	}
+	file { '/etc/rc.local':
+		mode   => '0755',
+		source => 'puppet:///modules/debian-org/rc.local',
+		notify => Exec['rc.local start'],
+	}
+	file { '/etc/molly-guard/run.d/15-acquire-reboot-lock':
+		mode    => '0755',
+		source  => 'puppet:///modules/debian-org/molly-guard-acquire-reboot-lock',
+		require => Package['molly-guard'],
+	}
+	file { '/etc/dsa':
+		ensure => directory,
+		mode   => '0755',
+	}
+	file { '/etc/dsa/cron.ignore.dsa-puppet-stuff':
+		source  => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron.ignore',
+		require => Package['debian.org']
+	}
+
+  # set mmap_min_addr to 4096 to mitigate
+  # Linux NULL-pointer dereference exploits
+	site::sysctl { 'mmap_min_addr':
+		key   => 'vm.mmap_min_addr',
+		value => '4096',
+	}
+	site::alternative { 'editor':
+		linkto => '/usr/bin/vim.basic',
+	}
+	mailalias { 'samhain-reports':
+		ensure => present,
+		recipient => $debianadmin,
+	}
+
+	exec { 'apt-get update':
+		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+		refreshonly => true,
+	}-> Package <| |>
 
-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"];
-   }
+	exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
+		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+		refreshonly => true
+	}
+	exec { 'puppetmaster restart':
+		path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+		refreshonly => true
+	}
+	exec { 'rc.local start':
+		path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+		refreshonly => true
+	}
+	exec { 'init q':
+		refreshonly => true
+	}
 }