}
site::aptrepo { 'buildd.debian.org':
- key => 'puppet:///modules/buildd/buildd.debian.org.asc',
+ key => 'puppet:///modules/buildd/buildd.debian.org.gpg',
url => 'https://buildd.debian.org/apt/',
suite => $suite,
components => 'main',
}
$buildd_prop_ensure = $::hostname ? {
- /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+ /^(alkman|brahms|porpora|zandonai)$/ => 'present',
default => 'absent',
}
+ if ($::lsbmajdistrelease >= 8) {
+ file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+ ensure => absent,
+ }
+ } else {
+ file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+ content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/servicecerts/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'],
+ require => [ Package['apt-transport-https'],
+ File['/etc/apt/apt.conf.d/puppet-https-buildd'] ],
}
# 'bad' extension