QChris has uploaded a new change for review.

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

Change subject: Lint statistics.pp: Make 'ensure' first item
......................................................................

Lint statistics.pp: Make 'ensure' first item

Change-Id: Ibc1f5b8456144d6009d2ad35339002f5d5d8c2b8
---
M manifests/misc/statistics.pp
1 file changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/139828/1

diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 5746803..493999f 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -124,12 +124,12 @@
     file { "/mnt/data": ensure => directory }
 
     mount { "/mnt/data":
+        ensure => mounted,
         device => "208.80.154.11:/data",
         fstype => "nfs",
         options => 
"ro,bg,tcp,rsize=8192,wsize=8192,timeo=14,intr,addr=208.80.154.11",
         atboot => true,
         require => [File['/mnt/data'], Class["nfs::common"]],
-        ensure => mounted,
     }
 }
 
@@ -143,9 +143,9 @@
     $statistics_mediawiki_directory = 
"${misc::statistics::base::working_path}/mediawiki/core"
 
     git::clone { "statistics_mediawiki":
+        ensure    => 'latest',
         directory => $statistics_mediawiki_directory,
         origin    => "https://gerrit.wikimedia.org/r/p/mediawiki/core.git";,
-        ensure    => 'latest',
         owner     => 'mwdeploy',
         group     => 'wikidev',
     }
@@ -664,18 +664,18 @@
     $db_pass           = $passwords::mysql::research::pass
 
     git::clone { "analytics/limn-mobile-data":
+        ensure    => latest,
         directory => $source_dir,
         origin    => $gerrit_repo,
         owner     => $user,
         require   => [User[$user]],
-        ensure    => latest,
     }
 
     file { $log:
+        ensure  => present,
         owner   => $user,
         group   => $user,
         mode    => '0660',
-        ensure  => present,
     }
 
     file { $mysql_credentials:
@@ -686,10 +686,10 @@
     }
 
     file { [$source_dir, $rsync_from, $output]:
+        ensure => directory,
         owner  => $user,
         group  => wikidev,
         mode   => '0775',
-        ensure => directory,
     }
 
     cron { "rsync_mobile_apps_stats":
@@ -719,9 +719,9 @@
     $geowiki_scripts_path = "${geowiki_base_path}/scripts"
 
     git::clone { 'geowiki-scripts':
+        ensure    => 'latest',
         directory => $geowiki_scripts_path,
         origin    => "https://gerrit.wikimedia.org/r/p/analytics/geowiki.git";,
-        ensure    => 'latest',
         owner     => $geowiki_user,
         group     => $geowiki_user,
     }
@@ -809,9 +809,9 @@
     $geowiki_private_data_bare_path = 
$misc::statistics::geowiki::data::private_bare::sync::geowiki_private_data_bare_path
 
     git::clone { 'geowiki-data-private':
+        ensure    => 'latest',
         directory => $geowiki_private_data_path,
         origin    => "file://${geowiki_private_data_bare_path}",
-        ensure    => 'latest',
         owner     => $geowiki_user,
         group     => 'www-data',
         mode      => 0750,
@@ -888,9 +888,9 @@
     $geowiki_mysql_research_conf_file = 
$misc::statistics::geowiki::mysql::conf::research::conf_file
 
     git::clone { 'geowiki-data-public':
+        ensure    => 'latest',
         directory => $geowiki_public_data_path,
         origin    => 
"ssh://gerrit.wikimedia.org:29418/analytics/geowiki/data-public.git",
-        ensure    => 'latest',
         owner     => $geowiki_user,
         group     => $geowiki_user,
     }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc1f5b8456144d6009d2ad35339002f5d5d8c2b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to