From f2c3ac3b6d62f9e0d049e370aa031daea503b7c7 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 17 Jul 2018 15:10:35 +0200 Subject: [PATCH] Remove wheezy-supporting cruft We're no longer running any wheezy hosts. --- modules/acpi/manifests/init.pp | 25 ++----- modules/apache2/manifests/init.pp | 6 +- modules/apache2/manifests/site.pp | 12 ++-- .../apache2/templates/default-debian.org.erb | 2 - modules/debian_org/manifests/init.pp | 7 +- modules/ferm/manifests/init.pp | 60 ++++++---------- modules/ferm/templates/ferm.conf.erb | 34 --------- modules/monit/manifests/init.pp | 70 +++---------------- modules/unbound/templates/unbound.conf.erb | 2 - 9 files changed, 45 insertions(+), 173 deletions(-) diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp index a3902ef40..8ec3b0613 100644 --- a/modules/acpi/manifests/init.pp +++ b/modules/acpi/manifests/init.pp @@ -1,24 +1,9 @@ class acpi { - if (versioncmp($::lsbmajdistrelease, '8') >= 0) { - package { 'acpid': - ensure => purged - } - - package { 'acpi-support-base': - ensure => purged - } - } elsif ($::kvmdomain) { - package { 'acpid': - ensure => installed - } - - service { 'acpid': - ensure => running, - require => Package['acpid'], - } + package { 'acpid': + ensure => purged + } - package { 'acpi-support-base': - ensure => installed - } + package { 'acpi-support-base': + ensure => purged } } diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index 14c2ff711..5fa11d405 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -105,10 +105,8 @@ class apache2 { apache2::module { 'mpm_prefork': ensure => absent } apache2::module { 'mpm_worker': } } - if versioncmp($::lsbmajdistrelease, '7') > 0 { - file { '/etc/apache2/mods-available/mpm_worker.conf': - content => template('apache2/mpm_worker.erb'), - } + file { '/etc/apache2/mods-available/mpm_worker.conf': + content => template('apache2/mpm_worker.erb'), } file { '/etc/apache2/sites-available/common-ssl.inc': diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp index 6d5ec55f3..dc9b1ced1 100644 --- a/modules/apache2/manifests/site.pp +++ b/modules/apache2/manifests/site.pp @@ -46,15 +46,11 @@ define apache2::site ( } } - if versioncmp($::lsbmajdistrelease, '7') <= 0 { - $symlink = "/etc/apache2/sites-enabled/${name}" - } else { - $symlink = "/etc/apache2/sites-enabled/${name}.conf" + $symlink = "/etc/apache2/sites-enabled/${name}.conf" - file { "/etc/apache2/sites-enabled/${name}": - ensure => absent, - notify => Exec['service apache2 reload'], - } + file { "/etc/apache2/sites-enabled/${name}": + ensure => absent, + notify => Exec['service apache2 reload'], } if $ensure == present { diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb index 0c9eff39a..da101071c 100644 --- a/modules/apache2/templates/default-debian.org.erb +++ b/modules/apache2/templates/default-debian.org.erb @@ -10,11 +10,9 @@ CustomLog /var/log/apache2/access.log privacy DocumentRoot /srv/www/default.debian.org/htdocs - <% if scope.call_function('versioncmp', [@lsbmajdistrelease, '7']) > 0 -%> Require all granted - <% end -%> HostnameLookups Off UseCanonicalName Off diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp index db17a742d..151dd571f 100644 --- a/modules/debian_org/manifests/init.pp +++ b/modules/debian_org/manifests/init.pp @@ -42,18 +42,13 @@ class debian_org { tag => extra_repo, } - if versioncmp($::lsbmajdistrelease, '8') >= 0 { - $rubyfs_package = 'ruby-filesystem' - } else { - $rubyfs_package = 'libfilesystem-ruby1.9' - } package { [ 'apt-utils', 'bash-completion', 'dnsutils', 'less', 'lsb-release', - $rubyfs_package, + 'ruby-filesystem', 'mtr-tiny', 'nload', 'pciutils', diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp index 06bafa9c6..9290d35c0 100644 --- a/modules/ferm/manifests/init.pp +++ b/modules/ferm/manifests/init.pp @@ -16,18 +16,12 @@ class ferm { package { 'ferm': ensure => installed } - if (versioncmp($::lsbmajdistrelease, '8') >= 0) { - package { 'ulogd2': - ensure => installed - } - package { 'ulogd': - # Remove instead of purge ulogd because it deletes log files on purge. - ensure => absent - } - } else { - package { 'ulogd': - ensure => installed - } + package { 'ulogd2': + ensure => installed + } + package { 'ulogd': + # Remove instead of purge ulogd because it deletes log files on purge. + ensure => absent } service { 'ferm': @@ -96,31 +90,23 @@ class ferm { content => template('ferm/interfaces.conf.erb'), notify => Service['ferm'], } - if (versioncmp($::lsbmajdistrelease, '8') >= 0) { - augeas { 'logrotate_ulogd2': - context => '/files/etc/logrotate.d/ulogd2', - changes => [ - 'set rule/schedule daily', - 'set rule/delaycompress delaycompress', - 'set rule/rotate 10', - 'set rule/ifempty notifempty', - ], - } - file { '/etc/logrotate.d/ulogd': - ensure => absent, - } - file { '/etc/logrotate.d/ulogd.dpkg-bak': - ensure => absent, - } - file { '/etc/logrotate.d/ulogd.dpkg-dist': - ensure => absent, - } - } else { - file { '/etc/logrotate.d/ulogd': - source => 'puppet:///modules/ferm/logrotate-ulogd', - mode => '0444', - require => Package['debian.org'], - } + augeas { 'logrotate_ulogd2': + context => '/files/etc/logrotate.d/ulogd2', + changes => [ + 'set rule/schedule daily', + 'set rule/delaycompress delaycompress', + 'set rule/rotate 10', + 'set rule/ifempty notifempty', + ], + } + file { '/etc/logrotate.d/ulogd': + ensure => absent, + } + file { '/etc/logrotate.d/ulogd.dpkg-bak': + ensure => absent, + } + file { '/etc/logrotate.d/ulogd.dpkg-dist': + ensure => absent, } } diff --git a/modules/ferm/templates/ferm.conf.erb b/modules/ferm/templates/ferm.conf.erb index b8a6b692e..1981abbfb 100644 --- a/modules/ferm/templates/ferm.conf.erb +++ b/modules/ferm/templates/ferm.conf.erb @@ -7,7 +7,6 @@ @include 'conf.d/'; -<% if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) >= 0 -%> domain (ip ip6) { table filter { chain log_and_reject { @@ -24,39 +23,6 @@ domain (ip ip6) { } } -<% else -%> -domain ip { - table filter { - chain log_and_reject { - ULOG ulog-prefix "REJECT: "; - proto tcp REJECT reject-with tcp-reset; - REJECT; - } - - chain log_or_drop { - mod hashlimit hashlimit-name ulogreject hashlimit-mode srcip hashlimit-burst 10 hashlimit 1/second jump log_and_reject; - mod hashlimit hashlimit-name uloglogdrop hashlimit-mode srcip hashlimit-burst 10 hashlimit 1/second ULOG ulog-prefix "DROP: "; - DROP; - } - - } -} -domain ip6 { - table filter { - chain log_and_reject { - LOG log-prefix "REJECT: "; - proto tcp REJECT reject-with tcp-reset; - REJECT; - } - - chain log_or_drop { - mod hashlimit hashlimit-name logreject hashlimit-mode srcip hashlimit-burst 10 hashlimit 1/second jump log_and_reject; - mod hashlimit hashlimit-name loglogdrop hashlimit-mode srcip hashlimit-burst 10 hashlimit 1/second LOG log-prefix "DROP: "; - DROP; - } - } -} -<% end -%> domain (ip ip6) { table filter { chain INPUT { diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp index 999cdfb3d..1543407a3 100644 --- a/modules/monit/manifests/init.pp +++ b/modules/monit/manifests/init.pp @@ -7,65 +7,15 @@ # include monit # class monit { - if versioncmp($::lsbmajdistrelease, '7') <= 0 { - package { 'monit': - ensure => installed - } - - augeas { 'inittab_monit': - context => '/files/etc/inittab', - changes => [ - 'set mo/runlevels 2345', - 'set mo/action respawn', - "set mo/process \"/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state\"", - ], - notify => Exec['init q'], - } - - file { '/etc/monit/': - ensure => directory, - mode => '0755', - purge => true, - notify => Exec['service monit stop'], - require => Package['monit'], - } - file { '/etc/monit/monit.d': - ensure => directory, - mode => '0750', - purge => true, - } - file { '/etc/monit/monitrc': - content => template('monit/monitrc.erb'), - mode => '0400' - } - file { '/etc/monit/monit.d/01puppet': - source => 'puppet:///modules/monit/puppet', - mode => '0440' - } - file { '/etc/monit/monit.d/00debian.org': - source => 'puppet:///modules/monit/debianorg', - mode => '0440' - } - file { '/etc/default/monit': - content => template('monit/default.erb'), - require => Package['monit'], - notify => Exec['service monit stop'] - } - - exec { 'service monit stop': - refreshonly => true, - } - } else { - package { 'monit': - ensure => purged - } - file { [ '/etc/monit/', - '/etc/monit/monit.d', - '/etc/monit/monit.d/01puppet', - '/etc/monit/monit.d/00debian.org' - ]: - ensure => absent, - force => true - } + package { 'monit': + ensure => purged + } + file { [ '/etc/monit/', + '/etc/monit/monit.d', + '/etc/monit/monit.d/01puppet', + '/etc/monit/monit.d/00debian.org' + ]: + ensure => absent, + force => true } } diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb index 2caa95501..92766758b 100644 --- a/modules/unbound/templates/unbound.conf.erb +++ b/modules/unbound/templates/unbound.conf.erb @@ -62,7 +62,5 @@ forward-zone: <% @ns.to_a.flatten.each do |nms| -%> forward-addr: <%= nms %> <% end -%> - # This will actually only work starting with unbound 1.4.18 (wheezy has 1.4.17) - # previously, forward-first was not implemented for the root zone. forward-first: yes <% end -%> -- 2.20.1