projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9685548
)
Tell bad apt where to find its certificate
author
Peter Palfrader
<peter@palfrader.org>
Wed, 1 Jan 2014 10:23:45 +0000
(10:23 +0000)
committer
Peter Palfrader
<peter@palfrader.org>
Wed, 1 Jan 2014 10:23:45 +0000
(10:23 +0000)
modules/buildd/manifests/init.pp
patch
|
blob
|
history
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
8d0b2c0
..
7eccfad
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-51,12
+51,17
@@
class buildd ($ensure=present) {
default => 'absent',
}
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 => $buildd_prop_ensure,
url => 'https://buildd.debian.org/apt/',
suite => "${suite}-proposed",
components => 'main',
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
}
# 'bad' extension