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'],
}
+ $buildd_prop_ensure = $::hostname ? {
+ /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+ default => 'absent',
+ }
+
+ 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 => $::hostname ? {
- /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
- default => 'absent',
- },
+ ensure => $buildd_prop_ensure,
url => 'https://buildd.debian.org/apt/',
suite => "${suite}-proposed",
components => 'main',
- require => Package['apt-transport-https'],
+ require => [ Package['apt-transport-https'],
+ File['/etc/apt/apt.conf.d/puppet-https-buildd'] ],
}
- #site::aptrepo { 'buildd.debian.org-experimental':
- # ensure => $::hostname ? {
- # /^(xxxx)$/ => 'present',
- # default => 'absent',
- # },
- # url => 'https://buildd.debian.org/apt/',
- # suite => "${suite}-experimental",
- # components => 'main',
- # require => Package['apt-transport-https'],
- #}
-
# 'bad' extension
file { '/etc/apt/preferences.d/buildd.debian.org':
ensure => absent,