projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Delete more munin-async files sooner
[mirror/dsa-puppet.git]
/
modules
/
buildd
/
manifests
/
init.pp
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
b58bd01
..
2809094
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-39,12
+39,11
@@
class buildd ($ensure=present) {
}
$suite = $::lsbdistcodename ? {
}
$suite = $::lsbdistcodename ? {
- squeeze => $::lsbdistcodename,
wheezy => $::lsbdistcodename,
jessie => $::lsbdistcodename,
stretch => $::lsbdistcodename,
wheezy => $::lsbdistcodename,
jessie => $::lsbdistcodename,
stretch => $::lsbdistcodename,
- undef => '
squeeze
',
- default => '
wheezy
'
+ undef => '
wheezy
',
+ default => '
jessie
'
}
$buildd_apt_url = $::debarchitecture ? {
}
$buildd_apt_url = $::debarchitecture ? {
@@
-95,7
+94,7
@@
class buildd ($ensure=present) {
require => Package['debian.org']
}
require => Package['debian.org']
}
- if ($::
lsbmajdistrelease >= 7 and $::
kernel == 'Linux') {
+ if ($::kernel == 'Linux') {
package { 'python-psutil':
ensure => installed,
}
package { 'python-psutil':
ensure => installed,
}
@@
-179,6
+178,17
@@
class buildd ($ensure=present) {
group => buildd,
owner => buildd,
}
group => buildd,
owner => buildd,
}
+ file { '/home/buildd/.gnupg':
+ ensure => directory,
+ mode => '700',
+ group => buildd,
+ owner => buildd,
+ }
+ file { '/home/buildd/.gnupg/gpg.conf':
+ content => "personal-digest-preferences SHA512\n",
+ group => buildd,
+ owner => buildd,
+ }
if ! $::buildd_key {
exec { 'create-buildd-key':
if ! $::buildd_key {
exec { 'create-buildd-key':