opendev/system-config
Code Issues Proposed changes

Set image location explicitly

Browse Source 
It's ideal for the image location in mediawiki to be outside of
its path. This allows you to have multiple copies of the software
while having the uploads in a shared spot.

Change-Id: Iae0ac3e13213353d6f101c62f5e150cf844b5694
Reviewed-on: https://review.openstack.org/17575
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Ryan Lane 2012-12-05 19:43:39 -08:00 committed by Jenkins
parent 2c6a5f3e8e
commit 9c3c631573
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,12 +4,13 @@ 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.
$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') {

1
modules/mediawiki/templates/apache/mediawiki.erb
View File

@ -96,6 +96,7 @@
Alias /w <%= scope.lookupvar('mediawiki::mediawiki_location') %>
Alias /wiki <%= scope.lookupvar('mediawiki::mediawiki_location') %>/index.php
Alias /images <%= scope.lookupvar('mediawiki::mediawiki_images_location') %>
ErrorLog /var/log/apache2/error.log

21
modules/openstack_project/manifests/wiki.pp
View File

@ -5,7 +5,7 @@ class openstack_project::wiki (
$sysadmins = [],
$ssl_cert_file_contents = '',
$ssl_key_file_contents = '',
$ssl_chain_file_contents = '',
$ssl_chain_file_contents = ''
) {
include openssl
@ -21,15 +21,16 @@ class openstack_project::wiki (
)
class { 'mediawiki':
role => 'all',
mediawiki_location => '/srv/mediawiki/w',
site_hostname => $::fqdn,
ssl_cert_file => "/etc/ssl/certs/${::fqdn}.pem",
ssl_key_file => "/etc/ssl/private/${::fqdn}.key",
ssl_chain_file => '/etc/ssl/certs/intermediate.pem',
ssl_cert_file_contents => $ssl_cert_file_contents,
ssl_key_file_contents => $ssl_key_file_contents,
ssl_chain_file_contents => $ssl_chain_file_contents,
role => 'all',
mediawiki_location => '/srv/mediawiki/w',
mediawiki_images_location => '/srv/mediawiki/images',
site_hostname => $::fqdn,
ssl_cert_file => "/etc/ssl/certs/${::fqdn}.pem",
ssl_key_file => "/etc/ssl/private/${::fqdn}.key",
ssl_chain_file => '/etc/ssl/certs/intermediate.pem',
ssl_cert_file_contents => $ssl_cert_file_contents,
ssl_key_file_contents => $ssl_key_file_contents,
ssl_chain_file_contents => $ssl_chain_file_contents,
}
class { 'memcached':
max_memory => 2048,