opendev
/
puppet-mediawiki
Code Issues Proposed changes

Put image data in a parallel path to source code 

To avoid co-mingling configuration-managed files with state data,
place them in parallel paths so that the latter can be mounted from
an external volume.

Change-Id: Ibfedb88bbcf7c816b200b978c987a7c2f3e9f0d4
This commit is contained in:
Jeremy Stanley 2019-08-09 23:48:24 +00:00
parent cd0f868884
commit 8cfec53993
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/init.pp
View File

@ -2,7 +2,7 @@
#
class mediawiki(
$mediawiki_location = '/srv/mediawiki/w',
$mediawiki_images_location = '/srv/mediawiki/images',
$mediawiki_images_location = '/srv/mediawiki-data/images',
$role = 'all',
$site_hostname = $::fqdn,
$serveradmin = "webmaster@${::fqdn}",
@ -39,6 +39,15 @@ class mediawiki(
ensure => directory,
}
file { '/srv/mediawiki-data':
ensure => directory,
}
file { $mediawiki_images_location:
ensure => directory,
require => File['/srv/mediawiki-data'],
}
file { '/srv/mediawiki/Settings.php':
ensure => file,
content => template('mediawiki/Settings.php.erb'),

2
templates/Settings.php.erb
View File

@ -106,7 +106,7 @@ $wgAllowUserJs = true;
$wgEnableUploads = false;
$wgUseImageMagick = true;
$wgImageMagickConvertCommand = "/usr/bin/convert";
$wgUploadDirectory = "/srv/mediawiki/images";
$wgUploadDirectory = "<%= @mediawiki_images_location %>";
$wgFileExtensions[] = 'svg';
# InstantCommons allows wiki to use images from http://commons.wikimedia.org