summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2015-01-24 11:21:44 -0500
committerMicah Anderson <micah@leap.se>2015-01-24 11:21:44 -0500
commit6f0a176f949fff329f2275e4e0ec707aa4f2bdf3 (patch)
treee97f57f0e65bff26380e6e645331f91c6f723ae8 /puppet/modules
parent19567504f45a1041a088a8b91e1eb323583661f5 (diff)
parentb2a59dc0d8d28b14450bfef9d109331e04d6c2cf (diff)
Merge branch 'feature/6664' into develop
Change-Id: Ie6b17b348dcabbb9df8d1788858adbd05cad2803
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/haveged/manifests/init.pp17
-rw-r--r--puppet/modules/site_check_mk/manifests/agent/haveged.pp9
-rw-r--r--puppet/modules/site_config/manifests/default.pp3
3 files changed, 29 insertions, 0 deletions
diff --git a/puppet/modules/haveged/manifests/init.pp b/puppet/modules/haveged/manifests/init.pp
new file mode 100644
index 00000000..6d6a3569
--- /dev/null
+++ b/puppet/modules/haveged/manifests/init.pp
@@ -0,0 +1,17 @@
+class haveged {
+
+ package { 'haveged':
+ ensure => present,
+ }
+
+ service { 'haveged':
+ ensure => running,
+ hasrestart => true,
+ hasstatus => true,
+ enable => true,
+ require => Package['haveged'],
+ subscribe => File['/etc/default/haveged'];
+ }
+
+ include site_check_mk::agent::haveged
+}
diff --git a/puppet/modules/site_check_mk/manifests/agent/haveged.pp b/puppet/modules/site_check_mk/manifests/agent/haveged.pp
new file mode 100644
index 00000000..92e77faa
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/haveged.pp
@@ -0,0 +1,9 @@
+class site_check_mk::agent::haveged {
+
+# check haveged process
+ file_line {
+ 'haveged_proc':
+ line => 'haveged_proc /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /usr/sbin/haveged',
+ path => '/etc/check_mk/mrpe.cfg';
+ }
+}
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index a20ffc3b..138efc97 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -38,6 +38,9 @@ class site_config::default {
# install/configure syslog
include site_config::syslog
+ # provide a basic level of quality entropy
+ include haveged
+
# install/remove base packages
include site_config::packages::base