Merge "Split out mediawiki module"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
971ae29bca
@ -74,6 +74,7 @@ INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-httpd"]="o
|
||||
INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-openstackid"]="origin/master"
|
||||
INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-redis"]="origin/master"
|
||||
INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-drupal"]="origin/master"
|
||||
INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-mediawiki"]="origin/master"
|
||||
|
||||
if [[ "$PUPPET_INTEGRATION_TEST" -ne "1" ]]; then
|
||||
# If puppet integration tests are not being run, merge SOURCE and INTEGRATION modules
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
# Class: mediawiki::app
|
||||
#
|
||||
class mediawiki::app {
|
||||
vcsrepo { '/srv/mediawiki/w':
|
||||
ensure => present,
|
||||
provider => git,
|
||||
source => 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git',
|
||||
revision => 'origin/master',
|
||||
}
|
||||
}
|
||||
|
||||
# vim:sw=2:ts=2:expandtab:textwidth=79
|
||||
@ -1,60 +0,0 @@
|
||||
# Class: mediawiki::image_scaler
|
||||
#
|
||||
class mediawiki::image_scaler {
|
||||
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,
|
||||
}
|
||||
include tmpreaper
|
||||
}
|
||||
@ -1,85 +0,0 @@
|
||||
# Class: mediawiki
|
||||
#
|
||||
class mediawiki(
|
||||
$role = '',
|
||||
$site_hostname = '',
|
||||
$mediawiki_location = '',
|
||||
$mediawiki_images_location = '',
|
||||
$ssl_cert_file = "/etc/ssl/certs/${::fqdn}.pem",
|
||||
$ssl_key_file = "/etc/ssl/private/${::fqdn}.key",
|
||||
$ssl_chain_file = '',
|
||||
$ssl_cert_file_contents = '', # If left empty puppet will not create file.
|
||||
$ssl_key_file_contents = '', # If left empty puppet will not create file.
|
||||
$ssl_chain_file_contents = '' # If left empty puppet will not create file.
|
||||
) {
|
||||
|
||||
if ($role == 'app' or $role == 'all') {
|
||||
# This is equivalent to apache::dev which is not puppet3
|
||||
# compatible with puppetlabs-apache 0.0.4:
|
||||
package { ['libaprutil1-dev',
|
||||
'libapr1-dev',
|
||||
'apache2-prefork-dev']:
|
||||
ensure => present,
|
||||
}
|
||||
|
||||
include apache
|
||||
include mediawiki::php
|
||||
include mediawiki::app
|
||||
|
||||
package { ['libapache2-mod-php5',
|
||||
'lua5.2']:
|
||||
ensure => present,
|
||||
}
|
||||
|
||||
if $ssl_cert_file_contents != '' {
|
||||
file { $ssl_cert_file:
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0640',
|
||||
content => $ssl_cert_file_contents,
|
||||
before => Apache::Vhost[$site_hostname],
|
||||
}
|
||||
}
|
||||
|
||||
if $ssl_key_file_contents != '' {
|
||||
file { $ssl_key_file:
|
||||
owner => 'root',
|
||||
group => 'ssl-cert',
|
||||
mode => '0640',
|
||||
content => $ssl_key_file_contents,
|
||||
before => Apache::Vhost[$site_hostname],
|
||||
}
|
||||
}
|
||||
|
||||
if $ssl_chain_file_contents != '' {
|
||||
file { $ssl_chain_file:
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0640',
|
||||
content => $ssl_chain_file_contents,
|
||||
before => Apache::Vhost[$site_hostname],
|
||||
}
|
||||
}
|
||||
|
||||
apache::vhost { $site_hostname:
|
||||
port => 443,
|
||||
docroot => 'MEANINGLESS ARGUMENT',
|
||||
priority => '50',
|
||||
template => 'mediawiki/apache/mediawiki.erb',
|
||||
ssl => true,
|
||||
}
|
||||
a2mod { 'rewrite':
|
||||
ensure => present,
|
||||
}
|
||||
a2mod { 'expires':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
if ($role == 'image-scaler' or $role == 'all') {
|
||||
include mediawiki::image_scaler
|
||||
include mediawiki::php
|
||||
include mediawiki::app
|
||||
}
|
||||
}
|
||||
|
||||
# vim:sw=2:ts=2:expandtab:textwidth=79
|
||||
@ -1,13 +0,0 @@
|
||||
# Class: mediawiki::php
|
||||
#
|
||||
class mediawiki::php {
|
||||
package { ['php5',
|
||||
'php5-cli',
|
||||
'php5-mysql',
|
||||
'php-apc',
|
||||
'php5-intl',
|
||||
'php-openid']:
|
||||
ensure => present,
|
||||
}
|
||||
# TODO: apc configuration
|
||||
}
|
||||
@ -1,117 +0,0 @@
|
||||
#####################################################################
|
||||
### THIS FILE IS MANAGED BY PUPPET
|
||||
### puppet:///files/apache/sites/labconsole.wikimedia.org
|
||||
#####################################################################
|
||||
# vim: filetype=apache
|
||||
|
||||
<VirtualHost *:80>
|
||||
ServerAdmin noc@openstack.org
|
||||
ServerName <%= scope.lookupvar("mediawiki::site_hostname") %>
|
||||
|
||||
DocumentRoot /var/www
|
||||
<Directory />
|
||||
Options FollowSymLinks
|
||||
AllowOverride None
|
||||
</Directory>
|
||||
<Directory /var/www/>
|
||||
Options Indexes FollowSymLinks MultiViews
|
||||
AllowOverride None
|
||||
Order allow,deny
|
||||
allow from all
|
||||
</Directory>
|
||||
|
||||
RewriteEngine on
|
||||
RewriteCond %{SERVER_PORT} !^443$
|
||||
RewriteRule ^/(.*)$ https://<%= scope.lookupvar("mediawiki::site_hostname") %>/$1 [L,R]
|
||||
|
||||
ErrorLog /var/log/apache2/mediawiki-error.log
|
||||
|
||||
# Possible values include: debug, info, notice, warn, error, crit,
|
||||
# alert, emerg.
|
||||
LogLevel warn
|
||||
|
||||
CustomLog /var/log/apache2/mediawiki-access.log combined
|
||||
ServerSignature Off
|
||||
|
||||
</VirtualHost>
|
||||
<VirtualHost *:443>
|
||||
ServerAdmin noc@openstack.org
|
||||
ServerName <%= scope.lookupvar("mediawiki::site_hostname") %>
|
||||
|
||||
SSLEngine on
|
||||
SSLProtocol All -SSLv2 -SSLv3
|
||||
SSLCertificateFile <%= scope.lookupvar("mediawiki::ssl_cert_file") %>
|
||||
SSLCertificateKeyFile <%= scope.lookupvar("mediawiki::ssl_key_file") %>
|
||||
<% if scope.lookupvar("mediawiki::ssl_chain_file") != "" %>
|
||||
SSLCertificateChainFile <%= scope.lookupvar("mediawiki::ssl_chain_file") %>
|
||||
<% end %>
|
||||
|
||||
RedirectMatch ^/$ http://<%= scope.lookupvar("mediawiki::site_hostname") %>/wiki/
|
||||
|
||||
DocumentRoot /var/www
|
||||
<Directory />
|
||||
Options FollowSymLinks
|
||||
AllowOverride None
|
||||
</Directory>
|
||||
<Directory /var/www/>
|
||||
Options Indexes FollowSymLinks MultiViews
|
||||
AllowOverride None
|
||||
Order allow,deny
|
||||
allow from all
|
||||
</Directory>
|
||||
<Directory "<%= scope.lookupvar('mediawiki::mediawiki_images_location') %>">
|
||||
# Ignore .htaccess files
|
||||
AllowOverride None
|
||||
|
||||
# Serve HTML as plaintext, don't execute SHTML
|
||||
AddType text/plain .html .htm .shtml .php
|
||||
|
||||
# Don't run arbitrary PHP code.
|
||||
php_admin_flag engine off
|
||||
</Directory>
|
||||
<IfModule mod_expires.c>
|
||||
ExpiresActive On
|
||||
<Directory "<%= scope.lookupvar('mediawiki::mediawiki_location') %>">
|
||||
<FilesMatch "\.(gif|jpe?g|png|css|js|woff|svg|eot|ttf)$">
|
||||
ExpiresByType image/gif A2592000
|
||||
ExpiresByType image/png A2592000
|
||||
ExpiresByType image/jpeg A2592000
|
||||
ExpiresByType text/css A2592000
|
||||
ExpiresByType text/javascript A2592000
|
||||
ExpiresByType application/x-javascript A2592000
|
||||
ExpiresByType application/x-font-woff A2592000
|
||||
ExpiresByType image/svg+xml A2592000
|
||||
ExpiresByType application/vnd.ms-fontobject A2592000
|
||||
ExpiresByType application/x-font-ttf A2592000
|
||||
## I think it's likely dangerous to enable this for the entire domain.
|
||||
## I'm nearly positive we only need to do so for the WebFonts.
|
||||
## For now I'm going to keep this disabled.
|
||||
#Header add Access-Control-Allow-Origin "*"
|
||||
</FilesMatch>
|
||||
</Directory>
|
||||
</IfModule>
|
||||
AddType application/x-font-woff .woff
|
||||
AddType application/vnd.ms-fontobject .eot
|
||||
# TTF doesn't have an official MIME type, but I really don't want to use application/octet-stream for it
|
||||
AddType application/x-font-ttf .ttf
|
||||
|
||||
Alias /w/images <%= scope.lookupvar('mediawiki::mediawiki_images_location') %>
|
||||
Alias /w <%= scope.lookupvar('mediawiki::mediawiki_location') %>
|
||||
Alias /wiki <%= scope.lookupvar('mediawiki::mediawiki_location') %>/index.php
|
||||
|
||||
# Redirect old /Article_Name urls
|
||||
RewriteEngine on
|
||||
RewriteCond %{REQUEST_URI} !^/w/
|
||||
RewriteCond %{REQUEST_URI} !^/wiki/
|
||||
RewriteRule ^/(.*)$ https://<%= scope.lookupvar("mediawiki::site_hostname") %>/wiki/$1 [L,R]
|
||||
|
||||
ErrorLog /var/log/apache2/error.log
|
||||
|
||||
# Possible values include: debug, info, notice, warn, error, crit,
|
||||
# alert, emerg.
|
||||
LogLevel warn
|
||||
|
||||
CustomLog /var/log/apache2/access.log combined
|
||||
ServerSignature Off
|
||||
|
||||
</VirtualHost>
|
||||
Loading…
x
Reference in New Issue
Block a user