Manage the favicon.ico file for the wiki

Install a favicon.ico file on the wiki server, consistent with our
other sites, and instruct the mediawiki class to make use of it.

Change-Id: Icc04b2e3e228687b0df8a4c8ec3fddc3e2e36fcb
Depends-On: Iba36d169335b2b8ee278f3f4500893a1641e4b28
This commit is contained in:
Jeremy Stanley 2017-02-28 17:57:12 +00:00
parent 3539729d20
commit efe6e0e3af

View File

@ -55,6 +55,7 @@ class openstack_project::wiki (
wg_googleanalyticsaccount => $wg_googleanalyticsaccount, wg_googleanalyticsaccount => $wg_googleanalyticsaccount,
wg_sitename => 'OpenStack', wg_sitename => 'OpenStack',
wg_logo => "https://${site_hostname}/w/images/thumb/c/c4/OpenStack_Logo_-_notext.png/30px-OpenStack_Logo_-_notext.png", wg_logo => "https://${site_hostname}/w/images/thumb/c/c4/OpenStack_Logo_-_notext.png/30px-OpenStack_Logo_-_notext.png",
favicon_path => '/srv/mediawiki/favicon.ico',
disallow_robots => $disallow_robots, disallow_robots => $disallow_robots,
} }
class { 'memcached': class { 'memcached':
@ -75,6 +76,15 @@ class openstack_project::wiki (
require => Mysql_backup::Backup_remote['wiki'], require => Mysql_backup::Backup_remote['wiki'],
} }
file { '/srv/mediawiki/favicon.ico':
ensure => present,
owner => 'root',
group => 'root',
mode => '0644',
source => 'puppet:///modules/openstack_project/status/favicon.ico',
require => File['/srv/mediawiki'],
}
if $bup_user != undef { if $bup_user != undef {
include bup include bup
bup::site { 'rs-ord': bup::site { 'rs-ord':