From efe6e0e3af7b8f58410167db6c9efb7fa015ba99 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 28 Feb 2017 17:57:12 +0000
Subject: [PATCH] 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
---
 modules/openstack_project/manifests/wiki.pp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp
index 979721ae72..84ec9d3259 100644
--- a/modules/openstack_project/manifests/wiki.pp
+++ b/modules/openstack_project/manifests/wiki.pp
@@ -55,6 +55,7 @@ class openstack_project::wiki (
     wg_googleanalyticsaccount  => $wg_googleanalyticsaccount,
     wg_sitename                => 'OpenStack',
     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,
   }
   class { 'memcached':
@@ -75,6 +76,15 @@ class openstack_project::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 {
     include bup
     bup::site { 'rs-ord':