From 0808e7cdefd89761bee793e373d391ea076ff3de Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Tue, 13 Feb 2018 09:15:10 +0100 Subject: [PATCH] More kfreebsd removal Signed-off-by: Aurelien Jarno --- manifests/site.pp | 2 -- modules/acpi/manifests/init.pp | 36 +++++++++---------- .../bacula/templates/default.bacula-fd.erb | 5 --- modules/debian_org/manifests/apt.pp | 16 +++------ modules/debian_org/templates/rc.local.erb | 7 ---- modules/kfreebsd/manifests/init.pp | 34 ------------------ .../templates/munin-node.plugin.conf.erb | 6 ---- .../templates/schroot-buildd/fstab.erb | 10 ------ .../schroot/templates/schroot-dsa/fstab.erb | 11 ------ 9 files changed, 21 insertions(+), 106 deletions(-) delete mode 100644 modules/kfreebsd/manifests/init.pp diff --git a/manifests/site.pp b/manifests/site.pp index 816257547..b0bd0f9d6 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -62,8 +62,6 @@ node default { if $::kernel == 'Linux' { include linux include acpi - } elsif $::kernel == 'GNU/kFreeBSD' { - include kfreebsd } if $::mta == 'exim4' { diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp index 2a4fc1563..a3902ef40 100644 --- a/modules/acpi/manifests/init.pp +++ b/modules/acpi/manifests/init.pp @@ -1,26 +1,24 @@ class acpi { - if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) { - if (versioncmp($::lsbmajdistrelease, '8') >= 0) { - package { 'acpid': - ensure => purged - } + if (versioncmp($::lsbmajdistrelease, '8') >= 0) { + package { 'acpid': + ensure => purged + } - package { 'acpi-support-base': - ensure => purged - } - } elsif ($::kvmdomain) { - package { 'acpid': - ensure => installed - } + package { 'acpi-support-base': + ensure => purged + } + } elsif ($::kvmdomain) { + package { 'acpid': + ensure => installed + } - service { 'acpid': - ensure => running, - require => Package['acpid'], - } + service { 'acpid': + ensure => running, + require => Package['acpid'], + } - package { 'acpi-support-base': - ensure => installed - } + package { 'acpi-support-base': + ensure => installed } } } diff --git a/modules/bacula/templates/default.bacula-fd.erb b/modules/bacula/templates/default.bacula-fd.erb index 96b2455c9..3d9206f60 100644 --- a/modules/bacula/templates/default.bacula-fd.erb +++ b/modules/bacula/templates/default.bacula-fd.erb @@ -9,12 +9,7 @@ ENABLED="yes" # Additional start arguments can be provided here -# ARGS="" -<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0].start_with?('kfreebsd') -%> -ARGS="" -<% else -%> ARGS="-u bacula -k" -<% end -%> # Default config file can be changed here # CONFIG="/etc/bacula/bacula-fd.conf" diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp index 3fc0979ee..90ac4fb52 100644 --- a/modules/debian_org/manifests/apt.pp +++ b/modules/debian_org/manifests/apt.pp @@ -3,14 +3,6 @@ # Stuff common to all debian.org servers # class debian_org::apt { - if versioncmp($::lsbmajdistrelease, '7') <= 0 { - $mungedcodename = $::lsbdistcodename - } elsif ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) { - $mungedcodename = "${::lsbdistcodename}-kfreebsd" - } else { - $mungedcodename = $::lsbdistcodename - } - if versioncmp($::lsbmajdistrelease, '8') <= 0 { $fallbackmirror = 'http://cdn-fastly.deb.debian.org/debian/' } else { @@ -25,7 +17,7 @@ class debian_org::apt { site::aptrepo { 'debian': url => $mirror, - suite => [ $mungedcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ], + suite => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ], components => ['main','contrib','non-free'] } @@ -36,7 +28,7 @@ class debian_org::apt { } else { site::aptrepo { 'security': url => [ 'http://security-cdn.debian.org/', 'http://security.anycast-test.mirrors.debian.org/debian-security/', 'http://security.debian.org/' ], - suite => "${mungedcodename}/updates", + suite => "${::lsbdistcodename}/updates", components => ['main','contrib','non-free'] } } @@ -49,10 +41,10 @@ class debian_org::apt { key => 'puppet:///modules/debian_org/db.debian.org.gpg', } - if ($::hostname in [] or $::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) { + if ($::hostname in []) { site::aptrepo { 'proposed-updates': url => $mirror, - suite => "${mungedcodename}-proposed-updates", + suite => "${::lsbdistcodename}-proposed-updates", components => ['main','contrib','non-free'] } } else { diff --git a/modules/debian_org/templates/rc.local.erb b/modules/debian_org/templates/rc.local.erb index 5667c3260..6b644b1a2 100755 --- a/modules/debian_org/templates/rc.local.erb +++ b/modules/debian_org/templates/rc.local.erb @@ -12,13 +12,6 @@ mkswap /dev/dasdc1 && swapon -p 30 /dev/dasdc1 fi <%- end -%> -<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0].start_with?('kfreebsd') -%> - ( sleep 120; - service syslog-ng restart; - sleep 5; - init q - ) & disown -<%- end -%> if [ -e /proc/sys/kernel/modules_disabled ]; then ( sleep 60; diff --git a/modules/kfreebsd/manifests/init.pp b/modules/kfreebsd/manifests/init.pp deleted file mode 100644 index 66a6ee95d..000000000 --- a/modules/kfreebsd/manifests/init.pp +++ /dev/null @@ -1,34 +0,0 @@ -class kfreebsd { - - file { '/etc/cron.d/dsa-killruby': - source => 'puppet:///modules/kfreebsd/dsa-killruby', - } - - file { '/etc/sysctl.d/': - ensure => directory, - mode => '0755' - } - - file { '/etc/init.d/procps': - source => 'puppet:///modules/kfreebsd/procps.init', - mode => '0555', - before => Service['procps'], - notify => Exec['update-rc.d procps defaults'] - } - - site::sysctl { 'maxfiles': - key => 'kern.maxfiles', - value => 65536, - target => 'GNU/kFreeBSD', - } - site::sysctl { 'accept_ra': - key => 'net.inet6.ip6.accept_rtadv', - value => 0, - target => 'GNU/kFreeBSD', - } - - exec { 'update-rc.d procps defaults': - path => '/usr/bin:/usr/sbin:/bin:/sbin', - refreshonly => true, - } -} diff --git a/modules/munin/templates/munin-node.plugin.conf.erb b/modules/munin/templates/munin-node.plugin.conf.erb index 872ac55c8..07923e29e 100644 --- a/modules/munin/templates/munin-node.plugin.conf.erb +++ b/modules/munin/templates/munin-node.plugin.conf.erb @@ -104,9 +104,3 @@ env.exclude sbuild,schroot # filter out all the short-lived filesystems for df*: [df*] env.exclude_re ^/dev$ ^/run/.*$ ^/srv/piuparts-workspace/tmp.*$ ^/sys/.*$ ^/var/lib/schroot/mount/.*$ - -<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0].start_with?('kfreebsd') -%> -# Workaround for https://bugs.debian.org/767102 -[df*] -env.exclude devfs fdescfs linprocfs sysfs noprocfs linsysfs nfs nullfs -<% end %> diff --git a/modules/schroot/templates/schroot-buildd/fstab.erb b/modules/schroot/templates/schroot-buildd/fstab.erb index 7fe230f9d..2ff619834 100644 --- a/modules/schroot/templates/schroot-buildd/fstab.erb +++ b/modules/schroot/templates/schroot-buildd/fstab.erb @@ -4,14 +4,6 @@ # # -<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0].start_with?('kfreebsd') -%> -# kFreeBSD version -proc /proc linprocfs defaults 0 0 -dev /dev devfs rw 0 0 -dev /dev/fd fdescfs rw 0 0 - -/srv/build-trees /build nullfs rw 0 0 -<% else -%> # Linux version /proc /proc none rw,bind 0 0 /sys /sys none rw,bind 0 0 @@ -20,6 +12,4 @@ tmpfs-shm /dev/shm tmpfs defaults,size=64m 0 0 <%- if has_variable?("has_srv_build_trees") && @has_srv_build_trees -%> /srv/build-trees /build none rw,bind 0 0 - -<% end %> <% end %> diff --git a/modules/schroot/templates/schroot-dsa/fstab.erb b/modules/schroot/templates/schroot-dsa/fstab.erb index 1b08d0de9..ab1d12e74 100644 --- a/modules/schroot/templates/schroot-dsa/fstab.erb +++ b/modules/schroot/templates/schroot-dsa/fstab.erb @@ -4,15 +4,6 @@ # # -<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0].start_with?('kfreebsd') -%> -# kFreeBSD version -proc /proc linprocfs defaults 0 0 -dev /dev devfs rw 0 0 -dev /dev/fd fdescfs rw 0 0 -/home /home nullfs rw 0 0 -/tmp /tmp nullfs rw 0 0 - -<% else -%> # Linux version /proc /proc none rw,bind 0 0 /sys /sys none rw,bind 0 0 @@ -21,5 +12,3 @@ dev /dev/fd fdescfs rw 0 0 /home /home none rw,bind 0 0 /tmp /tmp none rw,bind 0 0 tmpfs-shm /dev/shm tmpfs defaults,size=64m 0 0 - -<% end %> -- 2.20.1