diff --git a/manifests/init.pp b/manifests/init.pp index 3e80b33..99e25a8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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') { diff --git a/templates/apache/mediawiki.erb b/templates/apache/mediawiki.erb index 3d2aaab..f89fb71 100644 --- a/templates/apache/mediawiki.erb +++ b/templates/apache/mediawiki.erb @@ -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