Merge branch 'master' into rspec

files/etc/monit/conf.d-extras/puppet-agent

+check file last_run_report.yaml with path /var/lib/puppet/state/last_run_report.yaml
+	if match "status: fail" then alert
+  if timestamp > 1 hour then alert

manifests/docker_extras.pp

@@ -13,13 +13,11 @@ class ubuntu_server::docker_extras {
     }
 
     file{'/etc/init/docker-update.conf':
-        ensure => present,
-        source => 'puppet:///modules/ubuntu_server/etc/init/docker-update.conf',
+        ensure => absent,
     }
 
     file{'/etc/init.d/docker-update':
-        ensure => link,
-        target => '/lib/init/upstart-job',
+        ensure => absent,
     }
 
-}
\ No newline at end of file
+}

manifests/monit.pp

 # Installs and configures Monit monitoring tool.
-class ubuntu_server::monit($admin_emails, $admin_user = 'madmin', $admin_passwd = 'gEt0ffMyL4wn', $mailserver = 'mailer.gwdg.de', $monit_basis_config_template = 'ubuntu_server/etc/monit/conf.d/config.erb', $monit_filesystems_config_template = 'ubuntu_server/etc/monit/conf.d/filesystems.erb', $monit_config_dir = 'puppet:///modules/ubuntu_server/etc/monit/conf.d', $docker_check = false) {
+class ubuntu_server::monit($admin_emails, $admin_user = 'madmin', $admin_passwd = 'gEt0ffMyL4wn', $mailserver = 'mailer.gwdg.de', $monit_basis_config_template = 'ubuntu_server/etc/monit/conf.d/config.erb', $monit_filesystems_config_template = 'ubuntu_server/etc/monit/conf.d/filesystems.erb', $monit_config_dir = 'puppet:///modules/ubuntu_server/etc/monit/conf.d', $docker_check = false, $puppet_check = false) {
 
     File{
         owner => root,
@@ -62,4 +62,12 @@ class ubuntu_server::monit($admin_emails, $admin_user = 'madmin', $admin_passwd
         } ~> Service['monit']
     }
 
+    if $puppet_check == true {
+        file{'/etc/monit/conf.d/puppet-agent':
+            ensure  => present,
+            source  => 'puppet:///modules/ubuntu_server/etc/monit/conf.d-extras/puppet-agent',
+            require => Package['monit'],
+        } ~> Service['monit']
+    }
+
 }