diff --git a/manifests/init.pp b/manifests/init.pp index 243b062..7174f39 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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, ) { diff --git a/templates/apache/mediawiki.erb b/templates/apache/mediawiki.erb index eeae7d5..5d87dea 100644 --- a/templates/apache/mediawiki.erb +++ b/templates/apache/mediawiki.erb @@ -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'] %> + "> + Require all granted + +<% end %> + <% if scope['mediawiki::disallow_robots'] == true %> # Request that search engines not index this site Alias /robots.txt /srv/mediawiki/robots.txt