jenkins-bot has submitted this change and it was merged.
Change subject: Lint
......................................................................
Lint
- Have puppet-lint ignore packages.pp and Apache's mods.pp.
- Alignment / spacing tweaks for conformity with puppet-lint style.
Change-Id: I54bf3e36d5344f4eb1df32387537eb4b8ea47950
---
M Rakefile
M puppet/modules/elasticsearch/manifests/init.pp
M puppet/modules/xhprof/manifests/init.pp
3 files changed, 12 insertions(+), 8 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Rakefile b/Rakefile
index a3cd591..5fd54e3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,6 +8,10 @@
PuppetLint.configuration.send('disable_2sp_soft_tabs')
PuppetLint.configuration.send('disable_class_parameter_defaults')
-PuppetLint.configuration.ignore_paths = ['puppet/manifests/roles.pp']
+PuppetLint.configuration.ignore_paths = [
+ 'puppet/manifests/roles.pp',
+ 'puppet/manifests/packages.pp',
+ 'puppet/modules/apache/manifests/mods.pp',
+]
task :default => [:lint]
diff --git a/puppet/modules/elasticsearch/manifests/init.pp
b/puppet/modules/elasticsearch/manifests/init.pp
index 05a6bbb..08a02ef 100644
--- a/puppet/modules/elasticsearch/manifests/init.pp
+++ b/puppet/modules/elasticsearch/manifests/init.pp
@@ -13,8 +13,8 @@
}
service { 'elasticsearch':
- enable => true,
ensure => running,
+ enable => true,
require => Package['elasticsearch', 'openjdk-7-jre-headless'],
}
}
diff --git a/puppet/modules/xhprof/manifests/init.pp
b/puppet/modules/xhprof/manifests/init.pp
index e52e6ed..b22c330 100644
--- a/puppet/modules/xhprof/manifests/init.pp
+++ b/puppet/modules/xhprof/manifests/init.pp
@@ -44,9 +44,9 @@
}
php::ini { 'xhprof':
- require => Exec['install xhprof'],
+ require => Exec['install xhprof'],
settings => {
- 'extension' => 'xhprof.so',
+ 'extension' => 'xhprof.so',
# Not used by the extension directly, used by the
# XHProf_Runs utility class
'xhprof.output_dir' => $profile_storage_dir,
@@ -58,14 +58,14 @@
ensure => directory,
owner => 'vagrant',
group => 'www-data',
- mode => 0775,
+ mode => '0775',
}
# Enable xhprof viewer on /xhprof directory of devwiki
apache::conf { 'xhprof':
- ensure => present,
- site => $role::mediawiki::wiki_name,
- source => 'puppet:///modules/xhprof/xhprof-apache-config',
+ ensure => present,
+ site => $role::mediawiki::wiki_name,
+ source => 'puppet:///modules/xhprof/xhprof-apache-config',
require => Php::Ini['xhprof'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/108226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I54bf3e36d5344f4eb1df32387537eb4b8ea47950
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
