projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
deploy a basic apache config for salsa
[mirror/dsa-puppet.git]
/
modules
/
debian_org
/
manifests
/
init.pp
diff --git
a/modules/debian_org/manifests/init.pp
b/modules/debian_org/manifests/init.pp
index
6226813
..
3861d71
100644
(file)
--- a/
modules/debian_org/manifests/init.pp
+++ b/
modules/debian_org/manifests/init.pp
@@
-12,6
+12,13
@@
class debian_org {
$servicefiles = 'absent'
}
$servicefiles = 'absent'
}
+ # the virtual facter needs virt-what on jessie to work
+ if versioncmp($::lsbmajdistrelease, '9') < 0 {
+ package { 'virt-what': ensure => installed }
+ } else {
+ package { 'virt-what': ensure => purged }
+ }
+
$debianadmin = [
'debian-archive-debian-samhain-reports@master.debian.org',
'debian-admin@ftbfs.de',
$debianadmin = [
'debian-archive-debian-samhain-reports@master.debian.org',
'debian-admin@ftbfs.de',
@@
-251,8
+258,8
@@
class debian_org {
owner => root,
group => root,
}
owner => root,
group => root,
}
- file { '/usr/local/bin/dsa-is-shutdown-
in-progress
':
- source => 'puppet:///modules/debian_org/dsa-is-shutdown-
in-progress
',
+ file { '/usr/local/bin/dsa-is-shutdown-
scheduled
':
+ source => 'puppet:///modules/debian_org/dsa-is-shutdown-
scheduled
',
mode => '0555',
}
mode => '0555',
}
@@
-306,4
+313,10
@@
class debian_org {
file { '/root/.vimrc':
source => 'puppet:///modules/debian_org/root-dotfiles/vimrc',
}
file { '/root/.vimrc':
source => 'puppet:///modules/debian_org/root-dotfiles/vimrc',
}
+
+ if versioncmp($::lsbmajdistrelease, '9') >= 0 { # older puppets do facts as strings.
+ if $::processorcount > 1 {
+ package { 'irqbalance': ensure => installed }
+ }
+ }
}
}