fix munin 1

[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 8d64f84..e8962c6 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -58,6 +58,7 @@ class debian-org {
                        'mtr-tiny',
                        'nload',
                        'pciutils',
+                       'lldpd',
                ]:
                ensure => installed,
        }
@@ -71,8 +72,6 @@ class debian-org {
                        'irqstats',
                        'load',
                        'memory',
-                       'ntp_offset',
-                       'ntp_states',
                        'open_files',
                        'open_inodes',
                        'processes',
@@ -137,6 +136,8 @@ class debian-org {
        }
        file { '/etc/puppet/puppet.conf':
                content => template('debian-org/puppet.conf.erb'),
+               mode => 0440,
+               group => 'puppet',
        }
        file { '/etc/default/puppet':
                source => 'puppet:///modules/debian-org/puppet.default',
@@ -191,7 +192,7 @@ class debian-org {
        file { '/etc/rc.local':
                mode   => '0755',
                content => template('debian-org/rc.local.erb'),
-               notify => Exec['service rc.local start'],
+               notify => Exec['service rc.local restart'],
        }
        file { '/etc/dsa':
                ensure => directory,
@@ -227,6 +228,10 @@ class debian-org {
                key   => 'kernel.perf_event_paranoid',
                value => '2',
        }
+       site::sysctl { 'puppet-vfs_cache_pressure':
+               key   => 'vm.vfs_cache_pressure',
+               value => '10',
+       }
        site::alternative { 'editor':
                linkto => '/usr/bin/vim.basic',
        }
@@ -253,7 +258,7 @@ class debian-org {
        exec { 'service puppetmaster restart':
                refreshonly => true
        }
-       exec { 'service rc.local start':
+       exec { 'service rc.local restart':
                refreshonly => true
        }
        exec { 'init q':