opendev/system-config
Code Issues Proposed changes

Merge "Manage the favicon.ico file for the wiki"

Browse Source
This commit is contained in:
Zuul 2018-12-17 16:36:32 +00:00 committed by Gerrit Code Review
commit 46fe20acc7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openstack_project/manifests/wiki.pp
View File

@ -45,6 +45,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':
@ -65,6 +66,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 { 'ord.rax': bup::site { 'ord.rax':