Ori.livneh has submitted this change and it was merged.
Change subject: mediawiki: lint
......................................................................
mediawiki: lint
* Put 'source' and 'content' parameters at the top for file resources
* Alphabetize includes
* Quote 'root' (it's a string).
* Comma after last parameter
Change-Id: Id0c7c3ef43ade9f746d7f72c88ab8600cd1a8521
---
M modules/mediawiki/manifests/cgroup.pp
M modules/mediawiki/manifests/init.pp
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/manifests/multimedia.pp
M modules/mediawiki/manifests/packages.pp
M modules/mediawiki/manifests/packages/hhvm.pp
M modules/mediawiki/manifests/php.pp
M modules/mediawiki/manifests/sync.pp
M modules/mediawiki/manifests/users.pp
M modules/mediawiki/manifests/web/sites.pp
10 files changed, 29 insertions(+), 55 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/manifests/cgroup.pp
b/modules/mediawiki/manifests/cgroup.pp
index 21fbd41..32a77e4 100644
--- a/modules/mediawiki/manifests/cgroup.pp
+++ b/modules/mediawiki/manifests/cgroup.pp
@@ -4,11 +4,10 @@
}
file { '/etc/init/mw-cgroup.conf':
- ensure => present,
+ source => 'puppet:///modules/mediawiki/cgroup/mw-cgroup.conf',
owner => 'root',
group => 'root',
- mode => '0644',
- source => 'puppet:///modules/mediawiki/cgroup/mw-cgroup.conf',
+ mode => '0444',
require => Package['cgroup-bin'],
}
@@ -19,10 +18,9 @@
}
file { '/usr/local/bin/cgroup-mediawiki-clean':
- ensure => present,
+ source => 'puppet:///modules/mediawiki/cgroup/cgroup-mediawiki-clean',
owner => 'root',
group => 'root',
mode => '0755',
- source => 'puppet:///modules/mediawiki/cgroup/cgroup-mediawiki-clean',
}
}
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index b62ff8b..9482091 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -1,15 +1,16 @@
class mediawiki {
- include ::mediawiki::users
- include ::mediawiki::sync
include ::mediawiki::cgroup
include ::mediawiki::packages
+ include ::mediawiki::sync
+ include ::mediawiki::users
+
include ::ssh::server
file { '/etc/cluster':
+ content => $::site,
owner => 'root',
group => 'root',
mode => '0444',
- content => $::site,
}
if $::realm == 'labs' {
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index ba5a2fa..b879d2e 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -35,6 +35,8 @@
file { '/etc/jobrunner':
ensure => directory,
+ owner => 'root',
+ group => 'root',
mode => '0555',
before => Service['jobrunner']
}
@@ -47,13 +49,8 @@
notify => Service['jobrunner'],
}
- file { '/etc/jobrunner.ini':
- ensure => absent,
- require => Service['jobrunner'],
- }
-
service { 'jobrunner':
- ensure => 'running',
+ ensure => running,
provider => 'upstart',
}
diff --git a/modules/mediawiki/manifests/multimedia.pp
b/modules/mediawiki/manifests/multimedia.pp
index 3f869a8..35c6c91 100644
--- a/modules/mediawiki/manifests/multimedia.pp
+++ b/modules/mediawiki/manifests/multimedia.pp
@@ -13,10 +13,10 @@
minute => '*/5',
}
- if $::lsbdistcodename == 'trusty' {
+ if ubuntu_version('>= trusty') {
$libav_package = 'libav-tools'
$libvips_package = 'libvips37'
- } elsif $::lsbdistcodename == 'precise' {
+ } else {
$libav_package = 'ffmpeg'
$libvips_package = 'libvips15'
}
@@ -35,13 +35,6 @@
'oggvideotools',
]:
ensure => present,
- }
-
- file { '/etc/wikimedia-image-scaler':
- ensure => file,
- owner => 'root',
- group => 'root',
- mode => '0644',
}
file { '/etc/fonts/conf.d/70-no-bitmaps.conf':
diff --git a/modules/mediawiki/manifests/packages.pp
b/modules/mediawiki/manifests/packages.pp
index bb3aa84..38dc123 100644
--- a/modules/mediawiki/manifests/packages.pp
+++ b/modules/mediawiki/manifests/packages.pp
@@ -98,7 +98,7 @@
ensure => present,
}
- if $::lsbdistcodename == 'precise' {
+ if ubuntu_version('precise') {
package { [
'libmemcached11', # formerly a dependency for php5-memcached
'php5-igbinary', # no longer in use
diff --git a/modules/mediawiki/manifests/packages/hhvm.pp
b/modules/mediawiki/manifests/packages/hhvm.pp
index dba0e2f..cf3eab2 100644
--- a/modules/mediawiki/manifests/packages/hhvm.pp
+++ b/modules/mediawiki/manifests/packages/hhvm.pp
@@ -6,12 +6,7 @@
# It works on Trusty and newer distros.
#
class mediawiki::packages::hhvm {
-
- if versioncmp($::lsbdistrelease, '14.04') < 0 {
- fail('HHVM is supported on Trusty or newer distributions.')
- }
-
- package { ['hhvm', 'hhvm-luasandbox', 'hhvm-fss', 'hhvm-wikidiff2']:
+ package { [ 'hhvm', 'hhvm-luasandbox', 'hhvm-fss', 'hhvm-wikidiff2' ]:
# For now, we want to always install the latest and the shiniest
ensure => latest
}
diff --git a/modules/mediawiki/manifests/php.pp
b/modules/mediawiki/manifests/php.pp
index 80287c7..e1d1bcb 100644
--- a/modules/mediawiki/manifests/php.pp
+++ b/modules/mediawiki/manifests/php.pp
@@ -49,7 +49,7 @@
require => Package['php-mail'],
}
- if $::lsbdistcodename == 'precise' {
+ if ubuntu_version('precise') {
file { '/etc/php5/conf.d/igbinary.ini':
source => 'puppet:///modules/mediawiki/php/igbinary.ini',
owner => 'root',
diff --git a/modules/mediawiki/manifests/sync.pp
b/modules/mediawiki/manifests/sync.pp
index ae37eba..b9d998c 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -35,8 +35,8 @@
file { '/usr/local/apache':
ensure => directory,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0755',
replace => false,
}
diff --git a/modules/mediawiki/manifests/users.pp
b/modules/mediawiki/manifests/users.pp
index a7c258d..945ba18 100644
--- a/modules/mediawiki/manifests/users.pp
+++ b/modules/mediawiki/manifests/users.pp
@@ -68,10 +68,10 @@
}
file { '/home/l10nupdate/.ssh/authorized_keys':
+ source => 'puppet:///modules/mediawiki/authorized_keys.l10nupdate',
owner => 'l10nupdate',
group => 'l10nupdate',
mode => '0400',
- source => 'puppet:///modules/mediawiki/authorized_keys.l10nupdate',
}
sudo_group { 'wikidev':
@@ -122,9 +122,9 @@
}
file { '/var/lib/pybal-check/.ssh/authorized_keys':
+ source => 'puppet:///modules/mediawiki/pybal_key',
owner => 'pybal-check',
group => 'pybal-check',
mode => '0440',
- source => 'puppet:///modules/mediawiki/pybal_key',
}
}
diff --git a/modules/mediawiki/manifests/web/sites.pp
b/modules/mediawiki/manifests/web/sites.pp
index 1c22095..c61f801 100644
--- a/modules/mediawiki/manifests/web/sites.pp
+++ b/modules/mediawiki/manifests/web/sites.pp
@@ -2,64 +2,54 @@
tag 'mediawiki', 'mw-apache-config'
# Now the sites, in strict sequence
apache::site { 'nonexistent':
- ensure => present,
+ source =>
'puppet:///modules/mediawiki/apache/sites/nonexistent.conf',
priority => 0,
- source => 'puppet:///modules/mediawiki/apache/sites/nonexistent.conf'
}
apache::site { 'wwwportals':
- ensure => present,
+ source => 'puppet:///modules/mediawiki/apache/sites/wwwportals.conf',
priority => 1,
- source => 'puppet:///modules/mediawiki/apache/sites/wwwportals.conf'
}
apache::site { 'redirects':
# this must be generated with the redirects.dat file still in
apache-config,
# then committed to puppet. This will change soon.
- ensure => present,
+ source => 'puppet:///modules/mediawiki/apache/sites/redirects.conf',
priority => 2,
- source => 'puppet:///modules/mediawiki/apache/sites/redirects.conf'
}
apache::site { 'main':
- ensure => present,
+ source => 'puppet:///modules/mediawiki/apache/sites/main.conf',
priority => 3,
- source => 'puppet:///modules/mediawiki/apache/sites/main.conf'
}
apache::site { 'remnant':
- ensure => present,
+ source => 'puppet:///modules/mediawiki/apache/sites/remnant.conf',
priority => 4,
- source => 'puppet:///modules/mediawiki/apache/sites/remnant.conf'
}
apache::site { 'search.wikimedia':
- ensure => present,
+ source =>
'puppet:///modules/mediawiki/apache/sites/search.wikimedia.conf',
priority => 5,
- source =>
'puppet:///modules/mediawiki/apache/sites/search.wikimedia.conf'
}
apache::site { 'secure.wikimedia':
- ensure => present,
+ source =>
'puppet:///modules/mediawiki/apache/sites/secure.wikimedia.conf',
priority => 6,
- source =>
'puppet:///modules/mediawiki/apache/sites/secure.wikimedia.conf'
}
apache::site { 'wikimania':
- ensure => present,
+ source => 'puppet:///modules/mediawiki/apache/sites/wikimania.conf',
priority => 7,
- source => 'puppet:///modules/mediawiki/apache/sites/wikimania.conf'
}
apache::site { 'wikimedia':
- ensure => present,
+ source => 'puppet:///modules/mediawiki/apache/sites/wikimedia.conf',
priority => 8,
- source => 'puppet:///modules/mediawiki/apache/sites/wikimedia.conf'
}
apache::site { 'foundation':
- ensure => present,
+ source => 'puppet:///modules/mediawiki/apache/sites/foundation.conf',
priority => 9,
- source => 'puppet:///modules/mediawiki/apache/sites/foundation.conf'
}
}
--
To view, visit https://gerrit.wikimedia.org/r/148010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id0c7c3ef43ade9f746d7f72c88ab8600cd1a8521
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
