X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=e8962c6dfa58cfa907bfe11ed08b8714a21352e6;hb=ff762dfdfbfdb5f5eead0b998c01a6e8feeeac67;hp=7cec647768e29218d40cf5a0434e7cdcd2688033;hpb=70e5ba97722e3a6dff3d8c906272cc94f847d16f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 7cec64776..e8962c6df 100644
--- 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':
@@ -290,6 +295,9 @@ class debian-org {
 	file { '/root/.screenrc':
 		source => 'puppet:///modules/debian-org/root-dotfiles/screenrc',
 	}
+	file { '/root/.tmux.conf':
+		source => 'puppet:///modules/debian-org/root-dotfiles/tmux.conf',
+	}
 	file { '/root/.vimrc':
 		source => 'puppet:///modules/debian-org/root-dotfiles/vimrc',
 	}