opendev/system-config
Code Issues Proposed changes

Address puppet-lint warnings for mediawiki

Browse Source 
Also remove search.pp since this is just a place holder.

Change-Id: I2a862c84d6cb3d30abb5e9bfc5e139e9ec0b7df9
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-on: https://review.openstack.org/14988
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Paul Belanger 2012-10-29 15:20:50 -04:00 committed by Jenkins
parent 999d4e70c2
commit 512a3303a8
5 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/mediawiki/manifests/app.pp
View File

@ -1,9 +1,12 @@
# Class: mediawiki::app
#
class mediawiki::app { class mediawiki::app {
vcsrepo { '/srv/mediawiki/w':
vcsrepo { "/srv/mediawiki/w": ensure => latest,
ensure => latest,
provider => git, provider => git,
source => "https://gerrit.wikimedia.org/r/p/mediawiki/core.git", source => 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git',
revision => "origin/master", revision => 'origin/master',
} }
} }
# vim:sw=2:ts=2:expandtab:textwidth=79

4
modules/mediawiki/manifests/image_scaler.pp
View File

@ -1,3 +1,5 @@
# Class: mediawiki::image_scaler
#
class mediawiki::image_scaler { class mediawiki::image_scaler {
package { [ 'djvulibre-bin', package { [ 'djvulibre-bin',
'ffmpeg', 'ffmpeg',
@ -52,7 +54,7 @@ class mediawiki::image_scaler {
'xfonts-base', 'xfonts-base',
'xfonts-mplus', 'xfonts-mplus',
'xfonts-scalable']: 'xfonts-scalable']:
ensure => present; ensure => present,
} }
include tmpreaper include tmpreaper
} }

32
modules/mediawiki/manifests/init.pp
View File

@ -1,12 +1,18 @@
class mediawiki($role, $site_hostname, $mediawiki_location='') { # Class: mediawiki
#
class mediawiki(
$role,
$site_hostname,
$mediawiki_location = ''
) {
if ($role == 'app' or $role == 'all') { if ($role == 'app' or $role == 'all') {
include apache
require apache::dev require apache::dev
include mediawiki::php, include apache
mediawiki::app include mediawiki::php
include mediawiki::app
package { 'libapache2-mod-php5': package { 'libapache2-mod-php5':
ensure => present ensure => present,
} }
apache::vhost { $site_hostname: apache::vhost { $site_hostname:
@ -17,19 +23,17 @@ class mediawiki($role, $site_hostname, $mediawiki_location='') {
ssl => true, ssl => true,
} }
a2mod { 'rewrite': a2mod { 'rewrite':
ensure => present ensure => present,
} }
a2mod { 'expires': a2mod { 'expires':
ensure => present ensure => present,
} }
} }
if ($role == 'image-scaler' or $role == 'all') { if ($role == 'image-scaler' or $role == 'all') {
include mediawiki::image_scaler, include mediawiki::image_scaler
mediawiki::php, include mediawiki::php
mediawiki::app include mediawiki::app
}
if ($role == 'search' or $role == 'all') {
include mediawiki::search
} }
} }
# vim:sw=2:ts=2:expandtab:textwidth=79

2
modules/mediawiki/manifests/php.pp
View File

@ -1,3 +1,5 @@
# Class: mediawiki::php
#
class mediawiki::php { class mediawiki::php {
package { ['php5', 'php5-cli', 'php5-mysql', 'php-apc', 'php5-intl']: package { ['php5', 'php5-cli', 'php5-mysql', 'php-apc', 'php5-intl']:
ensure => present, ensure => present,

3
modules/mediawiki/manifests/search.pp
View File

@ -1,3 +0,0 @@
class mediawiki::search {
# Not currently defined. We should add lucene.
}