opendev/system-config
Code Issues Proposed changes

Cleanup mediawiki init.pp, image_scaler.pp, and php.pp manifest lint errors.

Browse Source 
Change-Id: I62bd3069bc491af0cd89569a1b306c765eeee864
Reviewed-on: https://review.openstack.org/14336
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
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:
Matthew Wagoner 2012-10-11 11:15:10 -04:00 committed by Jenkins
parent 5f5ea345eb
commit 8a77c1bd24
3 changed files with 62 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,58 @@
class mediawiki::image_scaler {
package { ["imagemagick", "ghostscript", "ffmpeg", "ffmpeg2theora", "librsvg2-bin", "djvulibre-bin", "netpbm", "libogg0", "libvorbisenc2", "libtheora0", "oggvideotools", "libvips15", "libvips-tools"]:
package { [ 'djvulibre-bin',
'ffmpeg',
'ffmpeg2theora',
'ghostscript',
'gsfonts',
'imagemagick',
'libogg0',
'librsvg2-bin',
'libtheora0',
'libvips15',
'libvips-tools',
'libvorbisenc2',
'netpbm',
'oggvideotools',
'texlive-fonts-recommended',
'ttf-alee',
'ttf-arabeyes',
'ttf-arphic-ukai',
'ttf-arphic-uming',
'ttf-bengali-fonts',
'ttf-devanagari-fonts',
'ttf-farsiweb',
'ttf-gujarati-fonts',
'ttf-kacst',
'ttf-kannada-fonts',
'ttf-khmeros',
'ttf-lao',
'ttf-liberation',
'ttf-linux-libertine',
'ttf-malayalam-fonts',
'ttf-manchufont',
'ttf-mgopen',
'ttf-nafees',
'ttf-oriya-fonts',
'ttf-punjabi-fonts',
'ttf-sil-abyssinica',
'ttf-sil-ezra',
'ttf-sil-padauk',
'ttf-sil-scheherazade',
'ttf-sil-yi',
'ttf-takao-gothic',
'ttf-takao-mincho',
'ttf-tamil-fonts',
'ttf-thai-tlwg',
'ttf-tmuni',
'ttf-ubuntu-font-family',
'ttf-unfonts-extra',
'ttf-wqy-zenhei',
'xfonts-100dpi',
'xfonts-75dpi',
'xfonts-base',
'xfonts-mplus',
'xfonts-scalable']:
ensure => present;
}
package { [ "gsfonts", "texlive-fonts-recommended", "ttf-alee", "ttf-arabeyes", "ttf-arphic-ukai", "ttf-arphic-uming", "ttf-bengali-fonts", "ttf-devanagari-fonts", "ttf-farsiweb", "ttf-gujarati-fonts", "ttf-kacst", "ttf-kannada-fonts", "ttf-khmeros", "ttf-lao", "ttf-liberation", "ttf-linux-libertine", "ttf-malayalam-fonts", "ttf-manchufont", "ttf-mgopen", "ttf-nafees", "ttf-oriya-fonts", "ttf-punjabi-fonts", "ttf-sil-abyssinica", "ttf-sil-ezra", "ttf-sil-padauk", "ttf-sil-scheherazade", "ttf-sil-yi", "ttf-takao-gothic", "ttf-takao-mincho", "ttf-tamil-fonts", "ttf-thai-tlwg", "ttf-tmuni", "ttf-ubuntu-font-family", "ttf-unfonts-extra", "ttf-wqy-zenhei", "xfonts-100dpi", "xfonts-75dpi", "xfonts-base", "xfonts-mplus", "xfonts-scalable"]:
ensure => present;
}
cron { "removetmpfiles":
command => "for dir in /tmp; do find \$dir -ignore_readdir_race -type f \\( -name 'gs_*' -o -name 'magick-*' \\) -cmin +15 -exec rm -f {} \\;; done",
user => root,
minute => '*/5',
ensure => present
}
include tmpreaper
}

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

@ -1,5 +1,5 @@
class mediawiki($role, $site_hostname, $mediawiki_location='') {
if ($role == "app" or $role == "all") {
if ($role == 'app' or $role == 'all') {
include apache
require apache::dev
include mediawiki::php,
@ -10,11 +10,11 @@ class mediawiki($role, $site_hostname, $mediawiki_location='') {
}
apache::vhost { $site_hostname:
port => 443,
docroot => 'MEANINGLESS ARGUMENT',
port => 443,
docroot => 'MEANINGLESS ARGUMENT',
priority => '50',
template => 'mediawiki/apache/mediawiki.erb',
ssl => true,
ssl => true,
}
a2mod { 'rewrite':
ensure => present
@ -24,12 +24,12 @@ class mediawiki($role, $site_hostname, $mediawiki_location='') {
}
}
if ($role == "image-scaler" or $role == "all") {
if ($role == 'image-scaler' or $role == 'all') {
include mediawiki::image_scaler,
mediawiki::php,
mediawiki::app
}
if ($role == "search" or $role == "all") {
if ($role == 'search' or $role == 'all') {
include mediawiki::search
}
}

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

@ -1,6 +1,6 @@
class mediawiki::php {
package { ["php5", "php5-cli", "php5-mysql", "php-apc", "php5-intl"]:
ensure => present;
package { ['php5', 'php5-cli', 'php5-mysql', 'php-apc', 'php5-intl']:
ensure => present,
}
# TODO: apc configuration
}