Merge "Optionally alias to a favicon.ico file if provided"
This commit is contained in:
commit
047a444178
|
@ -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,
|
||||
) {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue