From 103e56b48752f77fd66edd1824d82946570ca033 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 30 Apr 2012 22:20:51 +0100 Subject: [PATCH] no more lenny Signed-off-by: Stephen Gran --- manifests/site.pp | 6 +----- modules/acpi/manifests/init.pp | 6 ++---- modules/buildd/manifests/init.pp | 4 ---- .../etc/apt/sources.list.d/buildd.list.erb | 2 +- modules/debian-org/manifests/proliant.pp | 6 ------ modules/debian-org/misc/local.yaml | 2 -- .../backports.debian.org.list.erb | 4 ---- .../etc/apt/sources.list.d/security.list.erb | 4 ---- .../etc/apt/sources.list.d/volatile.list.erb | 2 -- .../pam.common-session-noninteractive.erb | 12 ----------- .../templates/pam.common-session.erb | 13 ------------ modules/monit/templates/default.erb | 6 ------ modules/monit/templates/monitrc.erb | 2 -- modules/nagios/templates/inc-debian.org.erb | 2 +- modules/nagios/templates/nrpe.cfg.erb | 4 ---- ...bsolete-packages-ignore.d-hostspecific.erb | 3 +-- modules/resolv/templates/resolv.conf.erb | 2 +- modules/samhain/templates/samhainrc.erb | 4 ---- modules/site/manifests/alternative.pp | 20 ++++--------------- modules/ssh/templates/sshd_config.erb | 2 +- modules/sudo/files/sudoers | 2 +- modules/sudo/files/sudoers.lenny | 7 ------- 22 files changed, 13 insertions(+), 102 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 3cb7b30b..593be680 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -59,9 +59,7 @@ node default { include postfix } - if $::lsbdistcodename != 'lenny' { - include unbound - } + include unbound if $::apache2 { include apache2 @@ -75,8 +73,6 @@ node default { include named::authoritative } elsif $::hostname in [geo1,geo2,geo3] { include named::geodns - } elsif $::hostname == 'liszt' { - include named::recursor } if $::hostname in [diabelli,nono,spohr] { diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp index ef4dcded..e6cce8de 100644 --- a/modules/acpi/manifests/init.pp +++ b/modules/acpi/manifests/init.pp @@ -9,10 +9,8 @@ class acpi { require => Package['acpid'], } - if $::lsbdistcodename != 'lenny' { - package { 'acpi-support-base': - ensure => installed - } + package { 'acpi-support-base': + ensure => installed } } } diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 76de9f15..63c5cf8a 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -41,10 +41,6 @@ class buildd { file { '/etc/apt/preferences.d/buildd.debian.org': ensure => absent, } - file { '/etc/apt/preferences.d': - ensure => directory, - mode => '0755' - } file { '/etc/apt/preferences.d/buildd': content => template('buildd/etc/apt/preferences.d/buildd'), before => File['/etc/apt/sources.list.d/buildd.debian.org.list'] diff --git a/modules/buildd/templates/etc/apt/sources.list.d/buildd.list.erb b/modules/buildd/templates/etc/apt/sources.list.d/buildd.list.erb index 90527987..8ffb4c6f 100644 --- a/modules/buildd/templates/etc/apt/sources.list.d/buildd.list.erb +++ b/modules/buildd/templates/etc/apt/sources.list.d/buildd.list.erb @@ -4,7 +4,7 @@ ## <% - builddsuites = %w{lenny squeeze wheezy} + builddsuites = %w{squeeze wheezy} testingunstable = 'wheezy' if builddsuites.include?(lsbdistcodename) suite = lsbdistcodename diff --git a/modules/debian-org/manifests/proliant.pp b/modules/debian-org/manifests/proliant.pp index 7b998cba..ea70b92c 100644 --- a/modules/debian-org/manifests/proliant.pp +++ b/modules/debian-org/manifests/proliant.pp @@ -22,12 +22,6 @@ class debian-org::proliant { ensure => installed, } - if $::lsbdistcodename == 'lenny' { - package { 'cpqarrayd': - ensure => installed, - } - } - if $::debarchitecture == 'amd64' { package { 'lib32gcc1': ensure => installed, diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index cae7aff5..649400df 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -66,7 +66,6 @@ nameinfo: lebrun.debian.org: Francesca Lebrun (March 24th, 1756 - May 14th, 1791) lilburn.debian.org: Douglas Gordon Lilburn (November 2nd, 1915 - June 6th, 2001) lindberg.debian.org: Magnus Lindberg (June 27th, 1958) - liszt.debian.org: Franz Liszt (October 22nd, 1811 - July 31st, 1886) locke.debian.org: Matthew Locke (ca. 1621 - 1677) lotti.debian.org: Antonio Lotti (ca. 1667 - January 5th, 1740) luchesi.debian.org: Andrea Luca Luchesi (May 23rd, 1741 - March 21st, 1801) @@ -84,7 +83,6 @@ nameinfo: parry.debian.org: Sir Charles Hubert Hastings Parry, 1st Baronet (February 27th, 1848 – October 7th, 1918) partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974) pasquini.debian.org: Bernardo Pasquini (December 7th, 1637 - November 22nd, 1710) - penalosa.debian.org: Francisco de Peñalosa (c. 1470 - April 1st, 1528) pergolesi.debian.org: Giovanni Battista Pergolesi (January 4th, 1710 - March 16th or 17th, 1736) peri.debian.org: Jacopo Peri (August 20th, 1561 - August 12th, 1633) pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980) diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/backports.debian.org.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/backports.debian.org.list.erb index 53485d11..a4238a1e 100644 --- a/modules/debian-org/templates/etc/apt/sources.list.d/backports.debian.org.list.erb +++ b/modules/debian-org/templates/etc/apt/sources.list.d/backports.debian.org.list.erb @@ -3,8 +3,4 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -<% if lsbdistcodename == 'lenny' %> -deb http://archive.debian.org/debian-backports/ lenny-backports main contrib non-free -<% elsif lsbdistcodename != 'n/a' %> deb http://backports.debian.org/debian-backports/ <%= lsbdistcodename %>-backports main contrib non-free -<% end %> diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb index 408e84e1..16b45b0a 100644 --- a/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb +++ b/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb @@ -3,8 +3,4 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -<% if lsbdistcodename == 'lenny' %> -deb http://archive.debian.org/debian-security/ lenny/updates main contrib non-free -<% elsif lsbdistcodename != 'n/a' %> deb http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free -<% end %> diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb index af8fcb9c..e55d490c 100644 --- a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb +++ b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb @@ -3,6 +3,4 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -<% unless %w{lenny n/a}.include?(scope.lookupvar('::lsbdistcodename')) %> deb http://ftp.debian.org/debian <%= lsbdistcodename %>-updates main contrib non-free -<% end %> diff --git a/modules/debian-org/templates/pam.common-session-noninteractive.erb b/modules/debian-org/templates/pam.common-session-noninteractive.erb index e13f9890..3b078a33 100644 --- a/modules/debian-org/templates/pam.common-session-noninteractive.erb +++ b/modules/debian-org/templates/pam.common-session-noninteractive.erb @@ -3,7 +3,6 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -<% unless lsbdistcodename == 'lenny' %> # # /etc/pam.d/common-session-noninteractive - session-related modules # common to all non-interactive services @@ -29,14 +28,3 @@ session required pam_permit.so # and here are more per-package modules (the "Additional" block) session required pam_unix.so # end of pam-auth-update config -<% else %> -# -# /etc/pam.d/common-session - session-related modules common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of modules that define tasks to be performed -# at the start and end of sessions of *any* kind (both interactive and -# non-interactive). The default is pam_unix. -# -session required pam_unix.so -<% end %> diff --git a/modules/debian-org/templates/pam.common-session.erb b/modules/debian-org/templates/pam.common-session.erb index b79cffaa..af94f822 100644 --- a/modules/debian-org/templates/pam.common-session.erb +++ b/modules/debian-org/templates/pam.common-session.erb @@ -3,7 +3,6 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -<% unless lsbdistcodename == 'lenny' %> # # /etc/pam.d/common-session - session-related modules common to all services # @@ -32,15 +31,3 @@ session required pam_unix.so session [success=1 default=ignore] pam_succeed_if.so quiet_fail quiet_success home = /nonexistent session optional pam_mkhomedir.so skel=/etc/skel umask=0022 session optional pam_permit.so -<% else %> -# -# /etc/pam.d/common-session - session-related modules common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of modules that define tasks to be performed -# at the start and end of sessions of *any* kind (both interactive and -# non-interactive). The default is pam_unix. -# -session required pam_unix.so -session optional pam_mkhomedir.so skel=/etc/skel umask=0022 -<% end %> diff --git a/modules/monit/templates/default.erb b/modules/monit/templates/default.erb index c2c53ecb..c13d24e5 100644 --- a/modules/monit/templates/default.erb +++ b/modules/monit/templates/default.erb @@ -11,9 +11,3 @@ # You must set this variable to for monit to start startup=0 -<% if lsbdistcodename == 'lenny' %> - -# To change the intervals which monit should run uncomment -# and change this variable. -CHECK_INTERVALS=300 -<% end %> diff --git a/modules/monit/templates/monitrc.erb b/modules/monit/templates/monitrc.erb index 41cff165..10ba1930 100644 --- a/modules/monit/templates/monitrc.erb +++ b/modules/monit/templates/monitrc.erb @@ -21,9 +21,7 @@ ## Start monit in the background (run as a daemon) and check services at ## 2-minute intervals. # -<% unless lsbdistcodename == 'lenny' %> set daemon 300 -<% end %> # # ## Set syslog logging with the 'daemon' facility. If the FACILITY option is diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb index b06c3284..3c5819f7 100644 --- a/modules/nagios/templates/inc-debian.org.erb +++ b/modules/nagios/templates/inc-debian.org.erb @@ -12,7 +12,7 @@ scope.lookupvar('site::localinfo').keys.sort.each do |node| end case fqdn when - 'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then + 'mundy.debian.org', 'caballero.debian.org' then nagii << '192.34.35.49' end diff --git a/modules/nagios/templates/nrpe.cfg.erb b/modules/nagios/templates/nrpe.cfg.erb index 97a1d9b8..f740aa6b 100644 --- a/modules/nagios/templates/nrpe.cfg.erb +++ b/modules/nagios/templates/nrpe.cfg.erb @@ -27,11 +27,7 @@ log_facility=daemon # number. The file is only written if the NRPE daemon is started by the root # user and is running in standalone mode. -<% unless lsbdistcodename == 'lenny' %> pid_file=/var/run/nagios/nrpe.pid -<% else %> -pid_file=/var/run/nrpe.pid -<% end %> # PORT NUMBER diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb index 189e57fe..05a055ea 100644 --- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb +++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb @@ -10,10 +10,9 @@ when "bellini.debian.org": ignore << "mcelog" when "cilea.debian.org": ignore << "/freeswitch.*/" when /draghi.debian.org/: ignore << %w{userdir-ldap libheimdal-kadm5-perl} when /orff.debian.org/: ignore << %w{libnet-dns-sec-perl libnet-dns-zone-parser-perl} -when /liszt.debian.org/: ignore << "amavisd-new" when /(zandonai|zelenka).debian.org/: ignore << %w{samhain zabbix-agent rrdcollect} when /(zappa|zemlinsky).debian.org/: ignore << %w{samhain} -when /(mayer|paer|peri|penalosa|corelli).debian.org/: ignore << "linux-base" +when /(mayer|paer|corelli).debian.org/: ignore << "linux-base" when /(alkman|caballero|merulo|mundy).debian.org/: ignore << "samhain" when "powell.debian.org": ignore << %w{e2fslibs e2fsprogs libblkid1 libcomerr2 libss2 libuuid1 uuid-runtime} when "rossini.debian.org": ignore << %w{ganeti2} diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index a5291bfa..2e1968b6 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -9,7 +9,7 @@ searchpaths = [] options = [] resolvconf = '' -if %w{draghi liszt}.include?(hostname) +if %w{draghi}.include?(hostname) nameservers << "127.0.0.1" end diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 1bdaeee4..9ed15dfb 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -151,9 +151,7 @@ file=/etc/ferm/ file=/etc/ferm/conf.d file=/etc/ferm/dsa.d file=/etc/rc.local -<% unless scope.lookupvar('::lsbdistcodename') == 'lenny' %> file=/etc/unbound -<% end -%> file=/etc/dsa <% if scope.lookupvar('site::nodeinfo')['puppetmaster'] %> @@ -422,9 +420,7 @@ file=/etc/ferm/conf.d/me.conf file=/etc/ferm/conf.d/defs.conf file=/etc/ferm/ferm.conf dir=2/etc/ssl/debian -<% unless scope.lookupvar('::lsbdistcodename') == 'lenny' %> file=/etc/unbound/unbound.conf -<% end -%> [IgnoreNone] ## diff --git a/modules/site/manifests/alternative.pp b/modules/site/manifests/alternative.pp index 1a40c157..6abc909b 100644 --- a/modules/site/manifests/alternative.pp +++ b/modules/site/manifests/alternative.pp @@ -1,25 +1,13 @@ define site::alternative ($linkto, $ensure = present) { case $ensure { present: { - if $::lsbdistcodename == 'lenny' { - exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}": - unless => "[ $(readlink -f /etc/alternatives/${name}) = ${linkto} ]", - } - } else { - exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}": - unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') = ${linkto} ]", - } + exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}": + unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') = ${linkto} ]", } } absent: { - if $::lsbdistcodename == 'lenny' { - exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}": - unless => "[ $(readlink -f /etc/alternatives/${name}) != ${linkto} ]", - } - } else { - exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}": - unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') != ${linkto} ]", - } + exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}": + unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') != ${linkto} ]", } } default: { fail ( "Unknown ensure value: '$ensure'" ) } diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb index 0f8657ae..2d179de8 100644 --- a/modules/ssh/templates/sshd_config.erb +++ b/modules/ssh/templates/sshd_config.erb @@ -75,7 +75,7 @@ AcceptEnv LANG LC_* Subsystem sftp /usr/lib/openssh/sftp-server UsePAM yes -<% if %w{lenny squeeze}.include?(lsbdistcodename) %> +<% if %w{squeeze}.include?(scope.lookupvar('::lsbdistcodename')) %> AuthorizedKeysFile /etc/ssh/userkeys/%u AuthorizedKeysFile2 /var/lib/misc/userkeys/%u <% else %> diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index 8f37e500..0efe5cbc 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -31,7 +31,7 @@ Host_Alias AACRAIDHOSTS = bellini, morricone, paganini, respighi, vivaldi, beeth Host_Alias MEGARAIDHOSTS = grieg, rautavaara, sibelius Host_Alias MPTRAIDHOSTS = master, fasch, holter, barber, biber, cilea, vitry, krenek, scelsi, orff, field Host_Alias MEGACTLHOSTS = lindberg, englund, heininen, nielsen -Host_Alias LISTHOSTS = liszt, bendel +Host_Alias LISTHOSTS = bendel # Cmnd alias specification diff --git a/modules/sudo/files/sudoers.lenny b/modules/sudo/files/sudoers.lenny index 60859d1a..bb6d767b 100644 --- a/modules/sudo/files/sudoers.lenny +++ b/modules/sudo/files/sudoers.lenny @@ -90,7 +90,6 @@ nagios beethoven=(debbackup) NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backup %keyring ALL=(keyring) ALL %lintian ALL=(lintian) ALL %listweb ALL=(listweb) ALL -%list liszt=(list) ALL %mirroradm ALL=(archvsync) ALL %nm ALL=(nm) ALL %patch-tracker ALL=(patch-tracker) ALL @@ -155,12 +154,6 @@ dak SECHOSTS=(archvsync) NOPASSWD: /home/archvsync/signal_security # web stuff debwww WEBHOSTS=(archvsync) NOPASSWD: /home/archvsync/webmirrors/runmirrors %press WEBHOSTS=(debwww) /org/www.debian.org/update-part News -# more list stuff -%list liszt=(root) /usr/sbin/postfix reload -%list liszt=(root) /usr/sbin/qshape, /usr/sbin/postsuper -%list liszt=(root) /etc/init.d/spamassassin, /etc/init.d/amavis -%list liszt=(amavis) NOPASSWD: /usr/bin/sa-learn -%list liszt=(amavis) ALL # geodns may reload bind geodnssync geo1,geo2,geo3=(root) NOPASSWD: /etc/init.d/bind9 reload geodnssync geo1,geo2,geo3=(root) NOPASSWD: /usr/sbin/rndc reconfig -- 2.39.2