Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148010
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/sync.pp
M modules/mediawiki/manifests/users.pp
M modules/mediawiki/manifests/web.pp
M modules/mediawiki/manifests/web/sites.pp
8 files changed, 27 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/148010/1
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 adb588a..4693a2d 100644
--- a/modules/mediawiki/manifests/multimedia.pp
+++ b/modules/mediawiki/manifests/multimedia.pp
@@ -46,18 +46,11 @@
target => '/etc/fonts/conf.avail/70-no-bitmaps.conf',
}
- file { '/a/magick-tmp':
+ file { [ '/a/magick-tmp', '/tmp/magick-tmp' ]:
ensure => directory,
owner => 'apache',
group => 'root',
mode => '0755',
- }
-
- file { '/tmp/magick-tmp':
- ensure => directory,
- owner => 'apache',
- group => 'root',
- mode => '0755',
}
}
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.pp
b/modules/mediawiki/manifests/web.pp
index 61b9d1e..03065ba 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -3,9 +3,10 @@
class mediawiki::web ( $workers_limit = undef) {
tag 'mediawiki', 'mw-apache-config'
+ include ::apache
include ::mediawiki
include ::mediawiki::monitoring::webserver
- include ::apache
+ include ::mediawiki::web::sites
$apache_server_limit = 256
@@ -39,6 +40,4 @@
file { '/etc/apache2/wikimedia':
ensure => directory,
}
-
- include ::mediawiki::web::sites
}
diff --git a/modules/mediawiki/manifests/web/sites.pp
b/modules/mediawiki/manifests/web/sites.pp
index 1c22095..274dad8 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,
- priority => 0,
source => 'puppet:///modules/mediawiki/apache/sites/nonexistent.conf'
+ priority => 0,
}
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,
- priority => 2,
source => 'puppet:///modules/mediawiki/apache/sites/redirects.conf'
+ priority => 2,
}
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,
- priority => 8,
source => 'puppet:///modules/mediawiki/apache/sites/wikimedia.conf'
+ priority => 8,
}
apache::site { 'foundation':
- ensure => present,
- priority => 9,
source => 'puppet:///modules/mediawiki/apache/sites/foundation.conf'
+ priority => 9,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/148010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0c7c3ef43ade9f746d7f72c88ab8600cd1a8521
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
