projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "add stackforge/openstacklib to 3rdparty"
[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
2c295df
..
7e91207
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-61,13
+61,20
@@
class debian-org {
source => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
}
source => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
}
+ if ($::lsbmajdistrelease >= 8) {
+ $rubyfs_package = 'ruby-filesystem'
+ } elsif $::lsbmajdistrelease == 7 {
+ $rubyfs_package = 'libfilesystem-ruby1.9'
+ } else {
+ $rubyfs_package = 'libfilesystem-ruby1.8'
+ }
package { [
'apt-utils',
'bash-completion',
'dnsutils',
'less',
'lsb-release',
package { [
'apt-utils',
'bash-completion',
'dnsutils',
'less',
'lsb-release',
-
'libfilesystem-ruby1.8'
,
+
$rubyfs_package
,
'mtr-tiny',
'nload',
'pciutils',
'mtr-tiny',
'nload',
'pciutils',
@@
-75,16
+82,6
@@
class debian-org {
ensure => installed,
}
ensure => installed,
}
- if $::lsbmajdistrelease == 7 {
- package { 'libfilesystem-ruby1.9.1':
- ensure => installed,
- }
- } elsif $::lsbmajdistrelease >= 8 {
- package { 'ruby-filesystem':
- ensure => installed,
- }
- }
-
munin::check { [
'cpu',
'entropy',
munin::check { [
'cpu',
'entropy',
@@
-365,6
+362,11
@@
class debian-org {
onlyif => "test -x /bin/systemctl"
}
onlyif => "test -x /bin/systemctl"
}
+ exec { 'systemd-tmpfiles --create --exclude-prefix=/dev':
+ refreshonly => true,
+ onlyif => "test -x /bin/systemd-tmpfiles"
+ }
+
tidy { '/var/lib/puppet/clientbucket/':
age => '2w',
recurse => 9,
tidy { '/var/lib/puppet/clientbucket/':
age => '2w',
recurse => 9,