opendev/system-config
Code Issues Proposed changes

Merge "Enable SSL for groups.openstack.org"

Browse Source
This commit is contained in:
Jenkins 2014-12-12 17:11:11 +00:00 committed by Gerrit Code Review
commit afd18da9a4
2 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/site.pp
View File

@ -210,11 +210,14 @@ node 'graphite.openstack.org' {
# Node-OS: precise
node 'groups.openstack.org' {
class { 'openstack_project::groups':
sysadmins => hiera('sysadmins', []),
site_admin_password => hiera('groups_site_admin_password', 'XXX'),
site_mysql_host => hiera('groups_site_mysql_host', 'localhost'),
site_mysql_password => hiera('groups_site_mysql_password', 'XXX'),
conf_cron_key => hiera('groups_conf_cron_key', 'XXX'),
sysadmins => hiera('sysadmins', []),
site_admin_password => hiera('groups_site_admin_password', 'XXX'),
site_mysql_host => hiera('groups_site_mysql_host', 'localhost'),
site_mysql_password => hiera('groups_site_mysql_password', 'XXX'),
conf_cron_key => hiera('groups_conf_cron_key', 'XXX'),
site_ssl_cert_file_contents => hiera('groups_site_ssl_cert_file_contents', undef),
site_ssl_key_file_contents => hiera('groups_site_ssl_key_file_contents', undef),
site_ssl_chain_file_contents => hiera('groups_site_ssl_chain_file_contents', undef),
}
}

49
modules/openstack_project/manifests/groups.pp
View File

@ -20,6 +20,12 @@ class openstack_project::groups (
$site_mysql_password = '',
$conf_cron_key = '',
$sysadmins = [],
$site_ssl_cert_file_contents = undef,
$site_ssl_key_file_contents = undef,
$site_ssl_chain_file_contents = undef,
$site_ssl_cert_file = '/etc/ssl/certs/groups.openstack.org.pem',
$site_ssl_key_file = '/etc/ssl/private/groups.openstack.org.key',
$site_ssl_chain_file = '/etc/ssl/certs/groups.openstack.org_ca.pem',
) {
realize (
@ -39,24 +45,31 @@ class openstack_project::groups (
}
class { 'drupal':
site_name => 'groups.openstack.org',
site_root => '/srv/vhosts/groups.openstack.org',
site_mysql_host => $site_mysql_host,
site_mysql_user => 'groups',
site_mysql_password => $site_mysql_password,
site_mysql_database => 'groups',
site_vhost_root => '/srv/vhosts',
site_admin_password => $site_admin_password,
site_alias => 'groups',
site_profile => 'groups',
site_base_url => 'http://groups.openstack.org',
package_repository => 'http://tarballs.openstack.org/groups/drupal-updates/release-history',
package_branch => 'stable',
conf_cron_key => $conf_cron_key,
conf_markdown_directory => '/srv/groups-static-pages',
conf_ga_account => 'UA-17511903-1',
conf_openid_provider => 'https://openstackid.org',
require => [ Class['openstack_project::server'],
site_name => 'groups.openstack.org',
site_root => '/srv/vhosts/groups.openstack.org',
site_mysql_host => $site_mysql_host,
site_mysql_user => 'groups',
site_mysql_password => $site_mysql_password,
site_mysql_database => 'groups',
site_vhost_root => '/srv/vhosts',
site_admin_password => $site_admin_password,
site_alias => 'groups',
site_profile => 'groups',
site_base_url => 'http://groups.openstack.org',
site_ssl_enabled => true,
site_ssl_cert_file_contents => $site_ssl_cert_file_contents,
site_ssl_key_file_contents => $site_ssl_key_file_contents,
site_ssl_chain_file_contents => $site_ssl_chain_file_contents,
site_ssl_cert_file => $site_ssl_cert_file,
site_ssl_key_file => $site_ssl_key_file,
site_ssl_chain_file => $site_ssl_chain_file,
package_repository => 'http://tarballs.openstack.org/groups/drupal-updates/release-history',
package_branch => 'stable',
conf_cron_key => $conf_cron_key,
conf_markdown_directory => '/srv/groups-static-pages',
conf_ga_account => 'UA-17511903-1',
conf_openid_provider => 'https://openstackid.org',
require => [ Class['openstack_project::server'],
Vcsrepo['/srv/groups-static-pages'] ],
}