require => Package['dupload'],
}
site::linux_module { 'dm_snapshot': }
- ferm::module { 'nf_conntrack_ftp': }
+ include ferm::ftp_conntrack
}
site::aptrepo { 'buildd':
require => Package['apt-transport-https'],
}
- if $::hostname in [alkman,porpora,zandonai] {
- site::aptrepo { 'buildd.debian.org-proposed':
- url => 'https://buildd.debian.org/apt/',
- suite => "${suite}-proposed",
- components => 'main',
- require => Package['apt-transport-https'],
- }
+ $buildd_prop_ensure = $::hostname ? {
+ /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+ default => 'absent',
}
- if $::hostname in [krenek] {
- site::aptrepo { 'buildd.debian.org-experimental':
- url => 'https://buildd.debian.org/apt/',
- suite => "${suite}-experimental",
- components => 'main',
- require => Package['apt-transport-https'],
- }
+ file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+ content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/certs/buildd.debian.org.crt\";\n",
+ #require => File['/etc/ssl/certs/buildd.debian.org.crt']
+ }
+ site::aptrepo { 'buildd.debian.org-proposed':
+ ensure => $buildd_prop_ensure,
+ url => 'https://buildd.debian.org/apt/',
+ suite => "${suite}-proposed",
+ components => 'main',
+ require => [ Package['apt-transport-https'],
+ File['/etc/apt/apt.conf.d/puppet-https-buildd'] ],
}
# 'bad' extension
ensure => absent,
}
file { '/etc/apt/preferences.d/buildd':
- content => template('buildd/etc/apt/preferences.d/buildd'),
- before => Site::Aptrepo['buildd.debian.org']
+ ensure => absent,
}
file { '/etc/cron.d/dsa-buildd':
source => 'puppet:///modules/buildd/cron.d-dsa-buildd',
require => Package['debian.org']
}
- if $::lsbmajdistrelease >= 7 {
+ if ($::lsbmajdistrelease >= 7 and $::kernel == 'Linux') {
package { 'python-psutil':
ensure => installed,
}