projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
install virt-what and use facter's default virtual facts
[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
a7ff786
..
eb0c425
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',
@@
-26,6
+33,7
@@
class debian_org {
'rsyslog',
'os-prober',
'apt-listchanges',
'rsyslog',
'os-prober',
'apt-listchanges',
+ 'mlocate',
]:
ensure => purged,
}
]:
ensure => purged,
}
@@
-250,6
+258,10
@@
class debian_org {
owner => root,
group => root,
}
owner => root,
group => root,
}
+ file { '/usr/local/bin/dsa-is-shutdown-scheduled':
+ source => 'puppet:///modules/debian_org/dsa-is-shutdown-scheduled',
+ mode => '0555',
+ }
exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
path => '/usr/bin:/usr/sbin:/bin:/sbin',