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
6cb629e
..
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',
@@
-26,6
+33,7
@@
class debian_org {
'rsyslog',
'os-prober',
'apt-listchanges',
'rsyslog',
'os-prober',
'apt-listchanges',
+ 'mlocate',
]:
ensure => purged,
}
]:
ensure => purged,
}
@@
-43,7
+51,7
@@
class debian_org {
source => 'puppet:///modules/debian_org/basic-ssh_known_hosts'
}
source => 'puppet:///modules/debian_org/basic-ssh_known_hosts'
}
- if
($::lsbmajdistrelease >= '8')
{
+ if
versioncmp($::lsbmajdistrelease, '8') >= 0
{
$rubyfs_package = 'ruby-filesystem'
} else {
$rubyfs_package = 'libfilesystem-ruby1.9'
$rubyfs_package = 'ruby-filesystem'
} else {
$rubyfs_package = 'libfilesystem-ruby1.9'
@@
-136,7
+144,7
@@
class debian_org {
}
file { '/etc/puppet/puppet.conf':
content => template('debian_org/puppet.conf.erb'),
}
file { '/etc/puppet/puppet.conf':
content => template('debian_org/puppet.conf.erb'),
- mode =>
0440
,
+ mode =>
'0440'
,
group => 'puppet',
}
file { '/etc/default/puppet':
group => 'puppet',
}
file { '/etc/default/puppet':
@@
-144,11
+152,11
@@
class debian_org {
}
file { '/etc/systemd':
ensure => directory,
}
file { '/etc/systemd':
ensure => directory,
- mode =>
0755
,
+ mode =>
'0755'
,
}
file { '/etc/systemd/system':
ensure => directory,
}
file { '/etc/systemd/system':
ensure => directory,
- mode =>
0755
,
+ mode =>
'0755'
,
}
file { '/etc/systemd/system/ud-replicated.service':
ensure => $servicefiles,
}
file { '/etc/systemd/system/ud-replicated.service':
ensure => $servicefiles,
@@
-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',
@@
-301,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 }
+ }
+ }
}
}