Merge "Optionally alias to a favicon.ico file if provided"

This commit is contained in:
Zuul 2018-12-17 16:33:14 +00:00 committed by Gerrit Code Review
commit 047a444178
2 changed files with 8 additions and 0 deletions

View File

@ -23,6 +23,7 @@ class mediawiki(
$wg_upgradekey = undef,
$wg_sitename = undef,
$wg_logo = undef,
$favicon_path = undef,
$wg_openidforcedprovider = 'https://login.launchpad.net/+openid',
$disallow_robots = false,
) {

View File

@ -98,6 +98,13 @@
Alias /w <%= scope['mediawiki::mediawiki_location'] %>
Alias /wiki <%= scope['mediawiki::mediawiki_location'] %>/index.php
<% if scope['mediawiki::favicon_path'] != nil %>
Alias /favicon.ico <%= scope['mediawiki::favicon_path'] %>
<Directory "<%= scope['mediawiki::favicon_path'] %>">
Require all granted
</Directory>
<% end %>
<% if scope['mediawiki::disallow_robots'] == true %>
# Request that search engines not index this site
Alias /robots.txt /srv/mediawiki/robots.txt