BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202986
Change subject: Fix puppet-lint warnings
......................................................................
Fix puppet-lint warnings
Fix almost all puppet-lint warnings. Most were about => indentation.
There is one left where puppet-lint doesn't like that we have a file
resource that is not in a module.
Change-Id: I7ebd04293d430fe5564a885728224009579509c8
---
M puppet/manifests/site.pp
M puppet/modules/apache/manifests/conf.pp
M puppet/modules/git/manifests/clone.pp
M puppet/modules/git/manifests/install.pp
M puppet/modules/kibana/manifests/dashboard.pp
M puppet/modules/kibana/manifests/init.pp
M puppet/modules/mediawiki/manifests/extension.pp
M puppet/modules/mediawiki/manifests/init.pp
M puppet/modules/mediawiki/manifests/jobrunner.pp
M puppet/modules/mediawiki/manifests/multiwiki.pp
M puppet/modules/mediawiki/manifests/parsoid.pp
M puppet/modules/mediawiki/manifests/skin.pp
M puppet/modules/memcached/manifests/init.pp
M puppet/modules/memcached/manifests/php.pp
M puppet/modules/phabricator/manifests/config.pp
M puppet/modules/phabricator/manifests/init.pp
M puppet/modules/role/manifests/accountinfo.pp
M puppet/modules/role/manifests/cirrussearch.pp
M puppet/modules/role/manifests/geodata_elastic.pp
M puppet/modules/role/manifests/globaluserpage.pp
M puppet/modules/role/manifests/imagemetrics.pp
M puppet/modules/role/manifests/labs_initial_content.pp
M puppet/modules/role/manifests/poolcounter.pp
M puppet/modules/role/manifests/simple_miser.pp
M puppet/modules/role/manifests/simple_performant.pp
M puppet/modules/role/manifests/urlshortener.pp
M puppet/modules/role/manifests/wikimetrics.pp
M puppet/modules/rsyslog/manifests/init.pp
M puppet/modules/sentry/manifests/init.pp
29 files changed, 147 insertions(+), 143 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/86/202986/1
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 87fb078..cb330f1 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -47,9 +47,9 @@
}
file { '/srv':
- owner => 'root',
- group => 'root',
- mode => '0755',
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
}
package { 'python-pip': } -> Package <| provider == pip |>
diff --git a/puppet/modules/apache/manifests/conf.pp
b/puppet/modules/apache/manifests/conf.pp
index 57370ea..27760d8 100644
--- a/puppet/modules/apache/manifests/conf.pp
+++ b/puppet/modules/apache/manifests/conf.pp
@@ -68,11 +68,11 @@
}
file { "/etc/apache2/${conf_type}-enabled/${conf_file}":
- ensure => $link_ensure,
- target => "/etc/apache2/${conf_type}-available/${conf_file}",
- notify => Service['apache2'],
- owner => 'root',
- group => 'root',
- mode => '0444',
+ ensure => $link_ensure,
+ target => "/etc/apache2/${conf_type}-available/${conf_file}",
+ notify => Service['apache2'],
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
}
}
diff --git a/puppet/modules/git/manifests/clone.pp
b/puppet/modules/git/manifests/clone.pp
index 7c55b8d..95ee5de 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -79,13 +79,13 @@
}
exec { "git_clone_${title}":
- command => "git clone ${arg_recurse} ${arg_depth} ${arg_branch}
${repository} ${directory}",
- cwd => '/',
- creates => "${directory}/.git",
- user => $owner,
- group => $group,
- require => Package['git'],
- timeout => 0,
+ command => "git clone ${arg_recurse} ${arg_depth} ${arg_branch}
${repository} ${directory}",
+ cwd => '/',
+ creates => "${directory}/.git",
+ user => $owner,
+ group => $group,
+ require => Package['git'],
+ timeout => 0,
}
if (!defined(File[$directory])) {
diff --git a/puppet/modules/git/manifests/install.pp
b/puppet/modules/git/manifests/install.pp
index 96414d8..b70214e 100644
--- a/puppet/modules/git/manifests/install.pp
+++ b/puppet/modules/git/manifests/install.pp
@@ -62,12 +62,12 @@
if $preserve_commit {
exec { "git_install_reset_${title}":
- command => 'git clean -d --force & git checkout -- .',
- cwd => $directory,
- user => $owner,
- unless => "git diff HEAD..${commit} --exit-code",
- notify => Exec["git_install_checkout_${title}"],
- require => Git::Clone[$title],
+ command => 'git clean -d --force & git checkout -- .',
+ cwd => $directory,
+ user => $owner,
+ unless => "git diff HEAD..${commit} --exit-code",
+ notify => Exec["git_install_checkout_${title}"],
+ require => Git::Clone[$title],
}
}
}
diff --git a/puppet/modules/kibana/manifests/dashboard.pp
b/puppet/modules/kibana/manifests/dashboard.pp
index 1cce538..74b321b 100644
--- a/puppet/modules/kibana/manifests/dashboard.pp
+++ b/puppet/modules/kibana/manifests/dashboard.pp
@@ -8,10 +8,10 @@
) {
$safe_title = regsubst($title, '\W_', '-', 'G')
$dashboard = {
- "user" => "guest",
- "group" => "guest",
- "title" => $safe_title,
- "dashboard" => $content,
+ 'user' => 'guest',
+ 'group' => 'guest',
+ 'title' => $safe_title,
+ 'dashboard' => $content,
}
exec { "save dashboard ${title}":
command => template('kibana/save-dashboard.erb'),
diff --git a/puppet/modules/kibana/manifests/init.pp
b/puppet/modules/kibana/manifests/init.pp
index e6272c0..54fc826 100644
--- a/puppet/modules/kibana/manifests/init.pp
+++ b/puppet/modules/kibana/manifests/init.pp
@@ -19,17 +19,17 @@
$default_route,
) {
git::clone { 'operations/software/kibana':
- directory => $deploy_dir,
ensure => 'latest',
+ directory => $deploy_dir,
owner => 'root',
group => 'root',
}
file { '/etc/kibana':
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0755',
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
}
file { '/etc/kibana/config.js':
diff --git a/puppet/modules/mediawiki/manifests/extension.pp
b/puppet/modules/mediawiki/manifests/extension.pp
index 888130b..7e222a5 100644
--- a/puppet/modules/mediawiki/manifests/extension.pp
+++ b/puppet/modules/mediawiki/manifests/extension.pp
@@ -165,12 +165,12 @@
}
mediawiki::settings { $title:
- ensure => $ensure,
- wiki => $ext_wiki,
- header => template('mediawiki/extension.php.erb'),
- values => $settings,
- priority => $priority,
- require => Git::Clone[$ext_repo],
+ ensure => $ensure,
+ wiki => $ext_wiki,
+ header => template('mediawiki/extension.php.erb'),
+ values => $settings,
+ priority => $priority,
+ require => Git::Clone[$ext_repo],
}
if $composer {
diff --git a/puppet/modules/mediawiki/manifests/init.pp
b/puppet/modules/mediawiki/manifests/init.pp
index a610eaf..57487cd 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -122,11 +122,11 @@
}
mediawiki::wiki { $wiki_name:
- db_name => $db_name,
- upload_dir => $upload_dir,
- server_url => $server_url,
- primary_wiki => true,
- require => [
+ db_name => $db_name,
+ upload_dir => $upload_dir,
+ server_url => $server_url,
+ primary_wiki => true,
+ require => [
Exec['set_mysql_password'],
Git::Clone['mediawiki/core'],
],
@@ -141,8 +141,8 @@
}
file { '/usr/local/bin/run-mediawiki-tests':
- source => 'puppet:///modules/mediawiki/run-mediawiki-tests',
- mode => '0755',
+ source => 'puppet:///modules/mediawiki/run-mediawiki-tests',
+ mode => '0755',
}
file { '/usr/local/bin/run-git-update':
@@ -151,8 +151,8 @@
}
file { '/usr/local/bin/import-mediawiki-dump':
- source => 'puppet:///modules/mediawiki/import-mediawiki-dump',
- mode => '0755',
+ source => 'puppet:///modules/mediawiki/import-mediawiki-dump',
+ mode => '0755',
}
exec { 'update_all_databases':
@@ -179,9 +179,9 @@
}
file { '/etc/logrotate.d/mediawiki_shared_log_groups':
- source =>
'puppet:///modules/mediawiki/wiki/logrotate.d-mediawiki-shared-log-groups',
- owner => 'root',
- group => 'root',
- mode => '0444',
+ source =>
'puppet:///modules/mediawiki/wiki/logrotate.d-mediawiki-shared-log-groups',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
}
}
diff --git a/puppet/modules/mediawiki/manifests/jobrunner.pp
b/puppet/modules/mediawiki/manifests/jobrunner.pp
index bab0efb..be7b858 100644
--- a/puppet/modules/mediawiki/manifests/jobrunner.pp
+++ b/puppet/modules/mediawiki/manifests/jobrunner.pp
@@ -48,10 +48,10 @@
}
file { '/etc/logrotate.d/mediawiki_jobrunner':
- source =>
'puppet:///modules/mediawiki/logrotate.d_mediawiki_jobrunner',
- owner => 'root',
- group => 'root',
- mode => '0444',
+ source =>
'puppet:///modules/mediawiki/logrotate.d_mediawiki_jobrunner',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
}
service { 'jobrunner':
diff --git a/puppet/modules/mediawiki/manifests/multiwiki.pp
b/puppet/modules/mediawiki/manifests/multiwiki.pp
index 7e0d7e4..ecd68be 100644
--- a/puppet/modules/mediawiki/manifests/multiwiki.pp
+++ b/puppet/modules/mediawiki/manifests/multiwiki.pp
@@ -57,8 +57,8 @@
}
file { $script_dir:
- ensure => directory,
- mode => '0755',
+ ensure => directory,
+ mode => '0755',
}
file { [
@@ -70,9 +70,9 @@
"${script_dir}/thumb.php",
"${script_dir}/thumb_handler.php",
]:
- ensure => present,
- mode => '0644',
- source => 'puppet:///modules/mediawiki/multiwiki/stub.php',
+ ensure => present,
+ mode => '0644',
+ source => 'puppet:///modules/mediawiki/multiwiki/stub.php',
}
file { "${script_dir}/dblist.php":
diff --git a/puppet/modules/mediawiki/manifests/parsoid.pp
b/puppet/modules/mediawiki/manifests/parsoid.pp
index e739fee..e35fdad 100644
--- a/puppet/modules/mediawiki/manifests/parsoid.pp
+++ b/puppet/modules/mediawiki/manifests/parsoid.pp
@@ -47,8 +47,8 @@
require_package( 'nodejs-legacy' )
git::clone { 'mediawiki/services/parsoid/deploy':
- directory => $dir,
- require => Package['nodejs', 'nodejs-legacy'],
+ directory => $dir,
+ require => Package['nodejs', 'nodejs-legacy'],
}
file { 'localsettings.js':
diff --git a/puppet/modules/mediawiki/manifests/skin.pp
b/puppet/modules/mediawiki/manifests/skin.pp
index 4e87435..f82dbeb 100644
--- a/puppet/modules/mediawiki/manifests/skin.pp
+++ b/puppet/modules/mediawiki/manifests/skin.pp
@@ -74,11 +74,11 @@
}
mediawiki::settings { $title:
- ensure => $ensure,
- wiki => $wiki,
- header => template('mediawiki/skin.php.erb'),
- values => $settings,
- require => Git::Clone[$skin_repo],
+ ensure => $ensure,
+ wiki => $wiki,
+ header => template('mediawiki/skin.php.erb'),
+ values => $settings,
+ require => Git::Clone[$skin_repo],
}
if $composer {
diff --git a/puppet/modules/memcached/manifests/init.pp
b/puppet/modules/memcached/manifests/init.pp
index b4a26f9..57e8cd1 100644
--- a/puppet/modules/memcached/manifests/init.pp
+++ b/puppet/modules/memcached/manifests/init.pp
@@ -35,8 +35,8 @@
}
service { 'memcached':
- ensure => running,
- enable => true,
- require => Package['memcached'],
+ ensure => running,
+ enable => true,
+ require => Package['memcached'],
}
}
diff --git a/puppet/modules/memcached/manifests/php.pp
b/puppet/modules/memcached/manifests/php.pp
index 31e518b..3270f0a 100644
--- a/puppet/modules/memcached/manifests/php.pp
+++ b/puppet/modules/memcached/manifests/php.pp
@@ -7,7 +7,7 @@
include ::apache
package { 'php5-memcached':
- ensure => present,
- notify => Service['apache2'],
+ ensure => present,
+ notify => Service['apache2'],
}
}
diff --git a/puppet/modules/phabricator/manifests/config.pp
b/puppet/modules/phabricator/manifests/config.pp
index 9d62f90..7721725 100644
--- a/puppet/modules/phabricator/manifests/config.pp
+++ b/puppet/modules/phabricator/manifests/config.pp
@@ -10,9 +10,9 @@
){
include ::phabricator
- exec { "phab_set_$title":
- command => "$deploy_dir/phabricator/bin/config set ${title}
'${value}'",
+ exec { "phab_set_${title}":
+ command => "${deploy_dir}/phabricator/bin/config set ${title}
'${value}'",
require => Git::Clone['https://github.com/phacility/phabricator'],
- unless => "grep '${title}'
$deploy_dir/phabricator/conf/local/local.json | grep '${value}'",
+ unless => "grep '${title}'
${deploy_dir}/phabricator/conf/local/local.json | grep '${value}'",
}
}
diff --git a/puppet/modules/phabricator/manifests/init.pp
b/puppet/modules/phabricator/manifests/init.pp
index a7079ad..32e1e86 100644
--- a/puppet/modules/phabricator/manifests/init.pp
+++ b/puppet/modules/phabricator/manifests/init.pp
@@ -37,47 +37,47 @@
require => Class['::apache::mod::rewrite'],
}
- phabricator::config { "mysql.pass":
+ phabricator::config { 'mysql.pass':
deploy_dir => $deploy_dir,
- value => "${mysql::root_password}",
+ value => $::mysql::root_password,
require => Class['::mysql'],
}
- phabricator::config { "phabricator.base-uri":
+ phabricator::config { 'phabricator.base-uri':
deploy_dir => $deploy_dir,
value => "http://${vhost_name}${::port_fragment}/";,
}
- phabricator::config { "search.elastic.host":
+ phabricator::config { 'search.elastic.host':
deploy_dir => $deploy_dir,
- value => "http://localhost:9200";,
+ value => 'http://localhost:9200',
require => Class['::elasticsearch'],
}
- phabricator::config { "pygments.enabled":
+ phabricator::config { 'pygments.enabled':
deploy_dir => $deploy_dir,
- value => "true",
+ value => true,
require => Package['python-pygments'],
}
- phabricator::config { "metamta.mail-adapter":
+ phabricator::config { 'metamta.mail-adapter':
deploy_dir => $deploy_dir,
- value => "PhabricatorMailImplementationTestAdapter",
+ value => 'PhabricatorMailImplementationTestAdapter',
}
- phabricator::config { "storage.upload-size-limit":
+ phabricator::config { 'storage.upload-size-limit':
deploy_dir => $deploy_dir,
- value => "100M",
+ value => '100M',
}
# Setup databases
exec { 'phab_setup_db':
- command => "$deploy_dir/phabricator/bin/storage upgrade --force",
+ command => "${deploy_dir}/phabricator/bin/storage upgrade --force",
require => Phabricator::Config['mysql.pass'],
- unless => "$deploy_dir/phabricator/bin/storage status > /dev/null",
+ unless => "${deploy_dir}/phabricator/bin/storage status > /dev/null",
}
- $phd = "$deploy_dir/phabricator/bin/phd"
+ $phd = "${deploy_dir}/phabricator/bin/phd"
service { 'phd':
ensure => running,
provider => base,
diff --git a/puppet/modules/role/manifests/accountinfo.pp
b/puppet/modules/role/manifests/accountinfo.pp
index 15f8fc7..832e556 100644
--- a/puppet/modules/role/manifests/accountinfo.pp
+++ b/puppet/modules/role/manifests/accountinfo.pp
@@ -6,7 +6,9 @@
include ::role::checkuser
mediawiki::extension { 'AccountInfo':
- settings => { 'wgPutIPinRC' => true, },
+ settings => {
+ 'wgPutIPinRC' => true,
+ },
require => Mediawiki::Extension['CheckUser'],
}
}
diff --git a/puppet/modules/role/manifests/cirrussearch.pp
b/puppet/modules/role/manifests/cirrussearch.pp
index 64025fe..16e4f13 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -29,8 +29,8 @@
}
elasticsearch::plugin { 'hebrew':
# Less stable then icu plugin
- ensure => 'absent',
- name => 'elasticsearch-analysis-hebrew',
+ ensure => 'absent',
+ name => 'elasticsearch-analysis-hebrew',
}
## Highlighter
elasticsearch::plugin { 'highlighter':
diff --git a/puppet/modules/role/manifests/geodata_elastic.pp
b/puppet/modules/role/manifests/geodata_elastic.pp
index 5ac11f6..aad8a39 100644
--- a/puppet/modules/role/manifests/geodata_elastic.pp
+++ b/puppet/modules/role/manifests/geodata_elastic.pp
@@ -7,15 +7,15 @@
mediawiki::settings { 'GeoData-elastic':
priority => $::LOAD_LATER,
- values => {
+ values => {
wgGeoDataBackend => 'elastic',
},
- notify => Exec['force geodata index'],
+ notify => Exec['force geodata index'],
}
exec { 'force geodata index':
- command => '/usr/local/bin/foreachwiki
extensions/CirrusSearch/maintenance/updateSearchIndexConfig.php',
- user => 'vagrant',
+ command => '/usr/local/bin/foreachwiki
extensions/CirrusSearch/maintenance/updateSearchIndexConfig.php',
+ user => 'vagrant',
refreshonly => true,
}
-}
\ No newline at end of file
+}
diff --git a/puppet/modules/role/manifests/globaluserpage.pp
b/puppet/modules/role/manifests/globaluserpage.pp
index 698530b..a61cf61 100644
--- a/puppet/modules/role/manifests/globaluserpage.pp
+++ b/puppet/modules/role/manifests/globaluserpage.pp
@@ -9,8 +9,8 @@
mediawiki::extension { 'GlobalUserPage':
settings => {
- wgGlobalUserPageDBname => 'gupwiki',
- wgGlobalUserPageAPIUrl =>
"http://gup${::mediawiki::multiwiki::base_domain}${::port_fragment}/w/api.php";,
+ wgGlobalUserPageDBname => 'gupwiki',
+ wgGlobalUserPageAPIUrl =>
"http://gup${::mediawiki::multiwiki::base_domain}${::port_fragment}/w/api.php";,
}
}
diff --git a/puppet/modules/role/manifests/imagemetrics.pp
b/puppet/modules/role/manifests/imagemetrics.pp
index 27aba77..b7d9faa 100644
--- a/puppet/modules/role/manifests/imagemetrics.pp
+++ b/puppet/modules/role/manifests/imagemetrics.pp
@@ -6,7 +6,7 @@
mediawiki::extension { 'ImageMetrics':
settings => {
- wgImageMetricsSamplingFactor => 1,
+ wgImageMetricsSamplingFactor => 1,
wgImageMetricsCorsSamplingFactor => 1,
},
}
diff --git a/puppet/modules/role/manifests/labs_initial_content.pp
b/puppet/modules/role/manifests/labs_initial_content.pp
index 93a4c8e..7c12cd2 100644
--- a/puppet/modules/role/manifests/labs_initial_content.pp
+++ b/puppet/modules/role/manifests/labs_initial_content.pp
@@ -12,13 +12,13 @@
}
file { "${::mediawiki::apache::docroot}/labs_mediawiki_logo.png":
- ensure => present,
- source => '/vagrant/puppet/modules/labs/files/labs_vagrant_logo.png'
+ ensure => present,
+ source => '/vagrant/puppet/modules/labs/files/labs_vagrant_logo.png'
}
file { "${::mediawiki::apache::docroot}/robots.txt":
- ensure => present,
- source => '/vagrant/puppet/modules/labs/files/robots.txt'
+ ensure => present,
+ source => '/vagrant/puppet/modules/labs/files/robots.txt'
}
mediawiki::settings { 'labs-vagrant logo':
diff --git a/puppet/modules/role/manifests/poolcounter.pp
b/puppet/modules/role/manifests/poolcounter.pp
index 9cfad61..5e2509f 100644
--- a/puppet/modules/role/manifests/poolcounter.pp
+++ b/puppet/modules/role/manifests/poolcounter.pp
@@ -12,7 +12,7 @@
}
mediawiki::extension { 'PoolCounter':
- priority => $LOAD_EARLY,
+ priority => $::LOAD_EARLY,
settings => [
'$wgPoolCountClientConf["servers"][] = "127.0.0.1";',
'$wgPoolCountClientConf["timeout"] = 0.5;',
diff --git a/puppet/modules/role/manifests/simple_miser.pp
b/puppet/modules/role/manifests/simple_miser.pp
index 1e5505d..4cccc0e 100644
--- a/puppet/modules/role/manifests/simple_miser.pp
+++ b/puppet/modules/role/manifests/simple_miser.pp
@@ -12,11 +12,11 @@
mediawiki::settings { 'simple_miser':
values => {
# Database
- wgMiserMode => true,
- wgSQLMode => 'null',
- wgUseFileCache => true,
- wgUseGzip => true,
- wgFileCacheDepth => 0,
+ wgMiserMode => true,
+ wgSQLMode => 'null',
+ wgUseFileCache => true,
+ wgUseGzip => true,
+ wgFileCacheDepth => 0,
},
notify => Exec['rebuild_file_cache'],
}
diff --git a/puppet/modules/role/manifests/simple_performant.pp
b/puppet/modules/role/manifests/simple_performant.pp
index 1611a95..92ce90b 100644
--- a/puppet/modules/role/manifests/simple_performant.pp
+++ b/puppet/modules/role/manifests/simple_performant.pp
@@ -23,7 +23,7 @@
}
mediawiki::settings { 'simple_performant':
- values => {
+ values => {
wgCacheDirectory => '/var/cache/mediawiki',
wgMainCacheType => $CACHE_ACCEL,
wgParserCacheType => $CACHE_DB,
@@ -41,7 +41,7 @@
},
},
},
- notify => Exec['rebuild_localisation_cache'],
+ notify => Exec['rebuild_localisation_cache'],
}
exec { 'rebuild_localisation_cache':
@@ -61,9 +61,9 @@
}
file { "${::mediawiki::apache::docroot}/robots.txt":
- ensure => present,
- mode => '0444',
- source => 'puppet:///modules/role/simple_performant/robots.txt',
+ ensure => present,
+ mode => '0444',
+ source => 'puppet:///modules/role/simple_performant/robots.txt',
}
file { '/vagrant/mediawiki/skins/.htaccess':
diff --git a/puppet/modules/role/manifests/urlshortener.pp
b/puppet/modules/role/manifests/urlshortener.pp
index 4fe8640..2c581e3 100644
--- a/puppet/modules/role/manifests/urlshortener.pp
+++ b/puppet/modules/role/manifests/urlshortener.pp
@@ -6,7 +6,9 @@
mediawiki::extension { 'UrlShortener':
needs_update => true,
- settings => { 'wgUrlShortenerTemplate' => '/s/$1' },
+ settings => {
+ 'wgUrlShortenerTemplate' => '/s/$1',
+ },
}
apache::site_conf { 'urlshortener_short_url_support':
diff --git a/puppet/modules/role/manifests/wikimetrics.pp
b/puppet/modules/role/manifests/wikimetrics.pp
index c15a85e..862c3dd 100644
--- a/puppet/modules/role/manifests/wikimetrics.pp
+++ b/puppet/modules/role/manifests/wikimetrics.pp
@@ -36,37 +36,37 @@
}
class { '::wikimetrics':
- path => $dir,
- group => $wikimetrics_group,
+ path => $dir,
+ group => $wikimetrics_group,
# Use the role::mediawiki MySQL database for
# wikimetrics editor cohort analysis
- db_user_mediawiki => $::mediawiki::db_user,
- db_pass_mediawiki => $::mediawiki::db_pass,
- db_name_mediawiki => $::mediawiki::db_name,
- db_host_mediawiki => 'localhost',
+ db_user_mediawiki => $::mediawiki::db_user,
+ db_pass_mediawiki => $::mediawiki::db_pass,
+ db_name_mediawiki => $::mediawiki::db_name,
+ db_host_mediawiki => 'localhost',
# Use the role::centralauth MySQL database for
# wikimetrics cohort user expansion
- db_user_centralauth => $::mediawiki::db_user,
- db_pass_centralauth => $::mediawiki::db_pass,
- db_name_centralauth => $::role::centralauth::shared_db,
- db_host_centralauth => 'localhost',
+ db_user_centralauth => $::mediawiki::db_user,
+ db_pass_centralauth => $::mediawiki::db_pass,
+ db_name_centralauth => $::role::centralauth::shared_db,
+ db_host_centralauth => 'localhost',
# clone wikimetrics as vagrant user
# so that it works properly in the shared
# /vagrant directory
- repository_owner => 'vagrant',
+ repository_owner => 'vagrant',
# wikimetrics runs on the LabsDB usually,
# where this table is called 'revision_userindex'.
# The mediawiki database usually calls this 'revision'.
- revision_tablename => 'revision',
- archive_tablename => 'archive',
+ revision_tablename => 'revision',
+ archive_tablename => 'archive',
# Since we are using the /vagrant shared directory for configs,
# make sure puppet doesn't try to change the ownership every time
# it runs.
- config_file_owner => 'vagrant',
- config_file_group => 'www-data',
+ config_file_owner => 'vagrant',
+ config_file_group => 'www-data',
# make upstart managed services start after
# /vagrant shared directory is mounted.
- service_start_on => 'vagrant-mounted',
+ service_start_on => 'vagrant-mounted',
}
# Run the wikimetrics/scripts/install script
diff --git a/puppet/modules/rsyslog/manifests/init.pp
b/puppet/modules/rsyslog/manifests/init.pp
index bad4cac..627016f 100644
--- a/puppet/modules/rsyslog/manifests/init.pp
+++ b/puppet/modules/rsyslog/manifests/init.pp
@@ -23,8 +23,8 @@
}
service { 'rsyslog':
- ensure => running,
- provider => 'upstart',
- require => Package['rsyslog'],
+ ensure => running,
+ provider => 'upstart',
+ require => Package['rsyslog'],
}
}
diff --git a/puppet/modules/sentry/manifests/init.pp
b/puppet/modules/sentry/manifests/init.pp
index b4cc48b..a1b62b5 100644
--- a/puppet/modules/sentry/manifests/init.pp
+++ b/puppet/modules/sentry/manifests/init.pp
@@ -108,7 +108,7 @@
ensure => present,
group => 'www-data',
content => template('sentry/sentry.conf.py.erb'),
- mode => 0640,
+ mode => '0640',
}
exec { 'initialize sentry database':
@@ -120,15 +120,15 @@
file { $sentry_create_project_script:
ensure => present,
content => template('sentry/sentry_create_project.py.erb'),
- mode => '755',
+ mode => '0755',
require => Virtualenv::Environment[$deploy_dir],
}
# make sure www-data can write to $dsn_file
file { $dsn_file:
- ensure => present,
- owner => 'www-data',
- mode => '644',
+ ensure => present,
+ owner => 'www-data',
+ mode => '0644',
}
exec { 'create sentry project':
@@ -155,9 +155,9 @@
}
service { 'sentry':
- ensure => running,
- provider => 'upstart',
- require => [Virtualenv::Environment[$deploy_dir],
Mysql::User[$db_user]],
- subscribe => [File[$cfg_file], Exec['create sentry project']],
+ ensure => running,
+ provider => 'upstart',
+ require => [Virtualenv::Environment[$deploy_dir],
Mysql::User[$db_user]],
+ subscribe => [File[$cfg_file], Exec['create sentry project']],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/202986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ebd04293d430fe5564a885728224009579509c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
