opendev/system-config
Code Issues Proposed changes

Merge "Move Drupal settings to conf variable"

Browse Source
This commit is contained in:
Jenkins 2015-02-25 08:32:06 +00:00 committed by Gerrit Code Review
commit 11d1a4e468
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,10 +66,12 @@ class openstack_project::groups (
site_ssl_chain_file => $site_ssl_chain_file, site_ssl_chain_file => $site_ssl_chain_file,
package_repository => 'http://tarballs.openstack.org/groups/drupal-updates/release-history', package_repository => 'http://tarballs.openstack.org/groups/drupal-updates/release-history',
package_branch => 'stable', package_branch => 'stable',
conf_cron_key => $conf_cron_key, conf => {
conf_markdown_directory => '/srv/groups-static-pages', 'cron_key' => $conf_cron_key,
conf_ga_account => 'UA-17511903-1', 'groups_feeds_markdown_directory' => '/srv/groups-static-pages',
conf_openid_provider => 'https://openstackid.org', 'googleanalytics_account' => 'UA-17511903-1',
'groups_openid_provider' => 'https://openstackid.org'
},
require => [ Class['openstack_project::server'], require => [ Class['openstack_project::server'],
Vcsrepo['/srv/groups-static-pages'] ], Vcsrepo['/srv/groups-static-pages'] ],
} }
@ -87,4 +89,4 @@ class openstack_project::groups (
backup_server => 'ci-backup-rs-ord.openstack.org', backup_server => 'ci-backup-rs-ord.openstack.org',
} }
} }

8
modules/openstack_project/manifests/groups_dev.pp
View File

@ -63,9 +63,11 @@ class openstack_project::groups_dev (
site_ssl_key_file => $site_ssl_key_file, site_ssl_key_file => $site_ssl_key_file,
package_repository => 'http://tarballs.openstack.org/groups/drupal-updates/release-history', package_repository => 'http://tarballs.openstack.org/groups/drupal-updates/release-history',
package_branch => 'dev', package_branch => 'dev',
conf_cron_key => $conf_cron_key, conf => {
conf_markdown_directory => '/srv/groups-static-pages', 'cron_key' => $conf_cron_key,
conf_openid_provider => 'https://openstackid-dev.openstack.org', 'groups_feeds_markdown_directory' => '/srv/groups-static-pages',
'groups_openid_provider' => 'https://openstackid.org'
},
require => [ Class['openstack_project::server'], require => [ Class['openstack_project::server'],
Vcsrepo['/srv/groups-static-pages'] ] Vcsrepo['/srv/groups-static-pages'] ]
} }