[MediaWiki-commits] [Gerrit] ocg: indentation fixes - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: ocg: indentation fixes
......................................................................


ocg: indentation fixes

fixes more puppet-lint warnings
for T93645

Change-Id: I3ea118175cf32216f07632117f8d2d07ca21ee48
---
M modules/ocg/manifests/decommission.pp
M modules/ocg/manifests/init.pp
2 files changed, 40 insertions(+), 40 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/ocg/manifests/decommission.pp 
b/modules/ocg/manifests/decommission.pp
index e0f8e0d..b4fa6dc 100644
--- a/modules/ocg/manifests/decommission.pp
+++ b/modules/ocg/manifests/decommission.pp
@@ -26,33 +26,33 @@
             '/etc/cron.hourly/logrotate.ocg',
             '/var/log/ocg',
         ]:
-        ensure  => absent,
-        purge   => true,
-        force   => true,
+        ensure => absent,
+        purge  => true,
+        force  => true,
     }
 
     file { $temp_dir:
-        ensure  => absent,
-        purge   => true,
-        force   => true,
+        ensure => absent,
+        purge  => true,
+        force  => true,
     }
 
     file { $output_dir:
-        ensure  => absent,
-        purge   => true,
-        force   => true,
+        ensure => absent,
+        purge  => true,
+        force  => true,
     }
 
     file { $postmortem_dir:
-        ensure  => absent,
-        purge   => true,
-        force   => true,
+        ensure => absent,
+        purge  => true,
+        force  => true,
     }
 
     file { $log_dir:
-        ensure  => absent,
-        purge   => true,
-        force   => true,
+        ensure => absent,
+        purge  => true,
+        force  => true,
     }
 
     package { 'ocg/ocg':
diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp
index 4a42f92..646220d 100644
--- a/modules/ocg/manifests/init.pp
+++ b/modules/ocg/manifests/init.pp
@@ -135,45 +135,45 @@
     }
 
     file { ['/srv/deployment','/srv/deployment/ocg']:
-        ensure  => directory,
-        owner   => 'root',
-        group   => 'root',
+        ensure => directory,
+        owner  => 'root',
+        group  => 'root',
     }
 
     if $temp_dir == '/srv/deployment/ocg/tmp' {
         file { $temp_dir:
-            ensure  => directory,
-            owner   => 'ocg',
-            group   => 'ocg',
+            ensure => directory,
+            owner  => 'ocg',
+            group  => 'ocg',
         }
     } else {
         File[$temp_dir] -> Class['ocg']
     }
 
     file { $output_dir:
-        ensure  => directory,
-        owner   => 'ocg',
-        group   => 'ocg',
+        ensure => directory,
+        owner  => 'ocg',
+        group  => 'ocg',
     }
 
     file { $postmortem_dir:
-        ensure  => directory,
-        owner   => 'ocg',
-        group   => 'ocg',
+        ensure => directory,
+        owner  => 'ocg',
+        group  => 'ocg',
     }
 
     file { $log_dir:
-        ensure  => directory,
+        ensure => directory,
         # matches /var/log
-        mode    => '0775',
-        owner   => 'root',
-        group   => 'syslog',
+        mode   => '0775',
+        owner  => 'root',
+        group  => 'syslog',
     }
 
     # help unfamiliar sysadmins find the logs
     file { '/var/log/ocg':
-        ensure  => link,
-        target  => $log_dir,
+        ensure => link,
+        target => $log_dir,
     }
 
     # makes some basic logfiles readable for non-roots
@@ -186,18 +186,18 @@
     }
 
     file { '/etc/logrotate.d/ocg':
-        ensure  => present,
-        source  => 'puppet:///modules/ocg/logrotate',
-        mode    => '0444',
-        owner   => 'root',
-        group   => 'root',
+        ensure => present,
+        source => 'puppet:///modules/ocg/logrotate',
+        mode   => '0444',
+        owner  => 'root',
+        group  => 'root',
     }
 
     # run logrotate hourly, instead of daily, to ensure that log size
     # limits are enforced more-or-less accurately
     file { '/etc/cron.hourly/logrotate.ocg':
-        ensure  => link,
-        target  => '/etc/cron.daily/logrotate',
+        ensure => link,
+        target => '/etc/cron.daily/logrotate',
     }
 
     rsyslog::conf { 'ocg':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ea118175cf32216f07632117f8d2d07ca21ee48
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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