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 (parent:
1d33caf
)
debian_org: remove jessie support
author
Julien Cristau
<jcristau@debian.org>
Tue, 10 Sep 2019 12:16:21 +0000
(14:16 +0200)
committer
Julien Cristau
<jcristau@debian.org>
Tue, 10 Sep 2019 12:18:47 +0000
(14:18 +0200)
modules/debian_org/manifests/init.pp
patch
|
blob
|
history
diff --git
a/modules/debian_org/manifests/init.pp
b/modules/debian_org/manifests/init.pp
index
93905c4
..
01cff6e
100644
(file)
--- a/
modules/debian_org/manifests/init.pp
+++ b/
modules/debian_org/manifests/init.pp
@@
-12,12
+12,8
@@
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 }
- }
+ # the virtual facter needs virt-what on jessie to work; clean up.
+ package { 'virt-what': ensure => purged }
$samhain_recipients = hiera('samhain_recipients')
$root_mail_alias = hiera('root_mail_alias')
$samhain_recipients = hiera('samhain_recipients')
$root_mail_alias = hiera('root_mail_alias')
@@
-118,12
+114,10
@@
class debian_org {
content => "Etc/UTC\n",
notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
}
content => "Etc/UTC\n",
notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
}
- if versioncmp($::lsbmajdistrelease, '9') >= 0 { # jessie has a regular file there, for instance
- file { '/etc/localtime':
- ensure => 'link',
- target => '/usr/share/zoneinfo/Etc/UTC',
- notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
- }
+ file { '/etc/localtime':
+ ensure => 'link',
+ target => '/usr/share/zoneinfo/Etc/UTC',
+ notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
}
file { '/etc/puppet/puppet.conf':
content => template('debian_org/puppet.conf.erb'),
}
file { '/etc/puppet/puppet.conf':
content => template('debian_org/puppet.conf.erb'),