[MediaWiki-commits] [Gerrit] puppet-lint: fix "ensure found on line but it's not the firs... - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/54610


Change subject: puppet-lint: fix "ensure found on line but it's not the first 
attribute"
......................................................................

puppet-lint: fix "ensure found on line but it's not the first attribute"

Change-Id: I7ab3a1bbf82fd5c1857f394f669ed48f8de646cc
---
M manifests/misc/icinga.pp
1 file changed, 24 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/54610/1

diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index f9f6322..c79b8ac 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -217,10 +217,10 @@
 
        file {
                '/etc/icinga/conf.d':
-                       owner  => 'root',
+                       ensure => directory,
+      owner  => 'root',
                        group  => 'root',
-                       mode   => '0755',
-                       ensure => directory;
+                       mode   => '0755';
 
                '/etc/nagios':
                        ensure => directory,
@@ -279,22 +279,22 @@
 
        file {
                '/usr/lib/nagios':
-                       owner => 'root',
+                       ensure => directory,
+      owner => 'root',
                        group => 'root',
-                       mode => '0755',
-                       ensure => directory;
+                       mode => '0755';
 
                '/usr/lib/nagios/plugins':
+      ensure => directory,
                        owner => 'root',
                        group => 'root',
-                       mode => '0755',
-                       ensure => directory;
+                       mode => '0755';
 
                '/usr/lib/nagios/plugins/eventhandlers':
+      ensure => directory,
                        owner => 'root',
                        group => 'root',
-                       mode => '0755',
-                       ensure => directory;
+                       mode => '0755';
 
                '/usr/lib/nagios/plugins/eventhandlers/submit_check_result':
                        source => 'puppet:///files/icinga/submit_check_result',
@@ -303,22 +303,22 @@
                        mode => '0755';
 
                '/var/lib/nagios/rm':
+      ensure => directory,
                        owner => icinga,
                        group => nagios,
-                       mode => '0775',
-                       ensure => directory;
+                       mode => '0775';
 
                '/etc/nagios-plugins':
+      ensure => directory,
                        owner => 'root',
                        group => 'root',
-                       mode => '0755',
-                       ensure => directory;
+                       mode => '0755';
 
                '/etc/nagios-plugins/config':
+      ensure => directory,
                        owner => 'root',
                        group => 'root',
-                       mode => '0755',
-                       ensure => directory;
+                       mode => '0755';
 
                '/etc/nagios-plugins/config/apt.cfg':
                        source => 
'puppet:///files/icinga/plugin-config/apt.cfg',
@@ -681,8 +681,8 @@
        # Fix permissions
 
        file { $icinga::monitor::configuration::variables::puppet_files:
-               mode => '0644',
-               ensure => present;
+               ensure => present,
+    mode   => '0644';
        }
 
                # Collect all (virtual) resources
@@ -822,11 +822,11 @@
 
        # FIXME: smptt crashes periodically on precise
        cron { 'restart_snmptt':
-               command => 'service snmptt restart 2>&1',
+               ensure => present,
+    command => 'service snmptt restart 2>&1',
                user => root,
                hour => [0, 4, 8, 12, 16, 20],
-               minute => 7,
-               ensure => present;
+               minute => 7;
        }
 
 }
@@ -839,10 +839,10 @@
                ensure => latest;
        }
        cron { 'ganglios-cron':
-               command => 'test -w /var/log/ganglia/ganglia_parser.log && 
/usr/sbin/ganglia_parser',
+               ensure => present,
+    command => 'test -w /var/log/ganglia/ganglia_parser.log && 
/usr/sbin/ganglia_parser',
                user => icinga,
-               minute => '*/2',
-               ensure => present;
+               minute => '*/2';
        }
        file { '/var/lib/ganglia/xmlcache':
                ensure => directory,

-- 
To view, visit https://gerrit.wikimedia.org/r/54610
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ab3a1bbf82fd5c1857f394f669ed48f8de646cc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits