225759f8a1
This reverts commit 7b9ea298cf4ae941af74381925b17a4b29337eb9. Upgrading puppetlabs-apache to version 0.4.0 will give us important variables in apache::params (specifically $conf_dir and $vdir) which will allow us to modify the cgit module to run on both Debuntu and RHEL systems -- which is useful because test.sh should be testing all modules on both systems. Of the two issues that 7b9ea298 addresses, I believe that our Oneiric hosts have all gone the way of the dinosaur and we can work around the docroot check by replacing 'MEANINGLESS ARGUMENT' with '/tmp/meaningless_docroot'. Conflicts: install_modules.sh Change-Id: I7c08f85db6810ab28fa044f1923833359271e8ec
79 lines
2.0 KiB
Puppet
79 lines
2.0 KiB
Puppet
# 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') {
|
|
require apache::dev
|
|
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 => '/tmp/meaningless_docroot',
|
|
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
|