opendev/system-config
Code Issues Proposed changes

Merge "Puppetize wiki.o.o settings"

Browse Source
This commit is contained in:
Jenkins 2016-02-24 18:45:06 +00:00 committed by Gerrit Code Review
commit e00d2f1dec
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/site.pp
View File

@ -387,11 +387,16 @@ node 'etherpad-dev.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'wiki.openstack.org' { node 'wiki.openstack.org' {
class { 'openstack_project::wiki': class { 'openstack_project::wiki':
mysql_root_password => hiera('wiki_db_password'), mysql_root_password => hiera('wiki_db_password'),
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
ssl_cert_file_contents => hiera('wiki_ssl_cert_file_contents'), ssl_cert_file_contents => hiera('wiki_ssl_cert_file_contents'),
ssl_key_file_contents => hiera('wiki_ssl_key_file_contents'), ssl_key_file_contents => hiera('wiki_ssl_key_file_contents'),
ssl_chain_file_contents => hiera('wiki_ssl_chain_file_contents'), ssl_chain_file_contents => hiera('wiki_ssl_chain_file_contents'),
wg_dbpassword => hiera('wiki_wg_dbpassword'),
wg_secretkey => hiera('wiki_wg_secretkey'),
wg_upgradekey => hiera('wiki_wg_upgradekey'),
wg_captchaquestions_answer => hiera('wiki_wg_captchaquestions_answer'),
wg_googleanalyticsaccount => hiera('wiki_wg_googleanalyticsaccount'),
} }
} }

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

@ -5,7 +5,12 @@ class openstack_project::wiki (
$sysadmins = [], $sysadmins = [],
$ssl_cert_file_contents = '', $ssl_cert_file_contents = '',
$ssl_key_file_contents = '', $ssl_key_file_contents = '',
$ssl_chain_file_contents = '' $ssl_chain_file_contents = '',
$wg_dbpassword = undef,
$wg_secretkey = undef,
$wg_upgradekey = undef,
$wg_captchaquestions_answer = undef,
$wg_googleanalyticsaccount = undef,
) { ) {
package { ['openssl', 'ssl-cert', 'subversion']: package { ['openssl', 'ssl-cert', 'subversion']:
@ -22,16 +27,21 @@ class openstack_project::wiki (
) )
class { 'mediawiki': class { 'mediawiki':
role => 'all', role => 'all',
mediawiki_location => '/srv/mediawiki/w', mediawiki_location => '/srv/mediawiki/w',
mediawiki_images_location => '/srv/mediawiki/images', mediawiki_images_location => '/srv/mediawiki/images',
site_hostname => $::fqdn, site_hostname => $::fqdn,
ssl_cert_file => "/etc/ssl/certs/${::fqdn}.pem", ssl_cert_file => "/etc/ssl/certs/${::fqdn}.pem",
ssl_key_file => "/etc/ssl/private/${::fqdn}.key", ssl_key_file => "/etc/ssl/private/${::fqdn}.key",
ssl_chain_file => '/etc/ssl/certs/intermediate.pem', ssl_chain_file => '/etc/ssl/certs/intermediate.pem',
ssl_cert_file_contents => $ssl_cert_file_contents, ssl_cert_file_contents => $ssl_cert_file_contents,
ssl_key_file_contents => $ssl_key_file_contents, ssl_key_file_contents => $ssl_key_file_contents,
ssl_chain_file_contents => $ssl_chain_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents,
wg_dbpassword => $wg_dbpassword,
wg_secretkey => $wg_secretkey,
wg_upgradekey => $wg_upgradekey,
wg_captchaquestions_answer => $wg_captchaquestions_answer,
wg_googleanalyticsaccount => $wg_googleanalyticsaccount,
} }
class { 'memcached': class { 'memcached':
max_memory => 2048, max_memory => 2048,