massive style guide fixups

[dsa-puppet.git] / modules / monit / manifests / init.pp

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 7792b086f0b55a619942500bfc9f4085a4119bd2..4c9b736bd49706076879956b4caf80a61253ca69 100644 (file)
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -1,76 +1,53 @@
 class monit {
-    package { "monit": ensure => installed }
 
-    $cmd = $::lsbdistcodename ? {
-         'sid'      => '/usr/bin/monit',
-         'wheezy'   => '/usr/bin/monit',
-         default  => '/usr/sbin/monit',
-    }
-
-    augeas { "inittab":
-        context => "/files/etc/inittab",
-        changes => [ "set mo/runlevels 2345",
-                     "set mo/action respawn",
-                     "set mo/process \"$cmd -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state\"",
-                   ],
-        notify => Exec["init q"],
-    }
-
-    file {
-        #"/etc/rc2.d/K99monit":
-        #  ensure  => "../init.d/monit";
-        #"/etc/rc2.d/S99monit":
-        #  ensure  => absent;
-
-        "/etc/monit/":
-          ensure  => directory,
-          owner   => root,
-          group   => root,
-          mode    => 755,
-          purge   => true
-          ;
-
-        "/etc/monit/monitrc":
-          content => template("monit/monitrc.erb"),
-          require => Package["monit"],
-          notify  => Exec["monit stop"],
-          mode    => 400
-          ;
-
-        "/etc/monit/monit.d":
-          ensure  => directory,
-          owner   => root,
-          group   => root,
-          mode    => 750,
-          purge   => true
-          ;
-
-        "/etc/monit/monit.d/01puppet":
-          source  => "puppet:///modules/monit/puppet",
-          require => Package["monit"],
-          notify  => Exec["monit stop"],
-          mode    => 440
-          ;
-
-        "/etc/monit/monit.d/00debian.org":
-          source  => "puppet:///modules/monit/debianorg",
-          require => Package["monit"],
-          notify  => Exec["monit stop"],
-          mode    => 440
-          ;
-
-        "/etc/default/monit":
-          content => template("monit/default.erb"),
-          require => Package["monit"],
-          notify  => Exec["monit stop"]
-          ;
-    }
-    exec { "monit stop":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
+       package { 'monit':
+               ensure => installed
+       }
+
+       $cmd = $::lsbdistcodename ? {
+               'sid'    => '/usr/bin/monit',
+               'wheezy' => '/usr/bin/monit',
+               default  => '/usr/sbin/monit',
+       }
+
+       augeas { 'inittab':
+               context => '/files/etc/inittab',
+               changes => [ 'set mo/runlevels 2345',
+                               'set mo/action respawn',
+                               "set mo/process \"$cmd -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state\"",
+               ],
+               notify => Exec['init q'],
+       }
+
+       file { [ '/etc/monit/', '/etc/monit/monit.d']:
+               ensure  => directory,
+               owner   => root,
+               group   => root,
+               mode    => '0755',
+               purge   => true,
+               notify  => Exec['monit stop'],
+               require => Package['monit'],
+       }
+       file { '/etc/monit/monitrc':
+               content => template('monit/monitrc.erb'),
+               mode    => '0400'
+       }
+       file { '/etc/monit/monit.d/01puppet':
+               source  => 'puppet:///modules/monit/puppet',
+               mode    => '0440'
+       }
+       file { '/etc/monit/monit.d/00debian.org':
+               source  => 'puppet:///modules/monit/debianorg',
+               mode    => '0440'
+       }
+       file { '/etc/default/monit':
+               content => template('monit/default.erb'),
+               require => Package['monit'],
+               notify  => Exec['monit stop']
+       }
+
+       exec { 'monit stop':
+               path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+               refreshonly => true,
+       }
 }
-
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: