opendev/system-config
Code Issues Proposed changes

Move Drupal settings to conf variable

Browse Source 
This change is using the new conf variable to set settings.php
variables instead of separate conf_xxx ones. It helps to extended
the configuration without puppet-drupal module rewrite.

Depends-On: I9e77d609bc6aaa3a5e10f065e79aa8a86cae151e
Change-Id: I991a121d081ee54800fb2988a040fddce0e0db48
This commit is contained in:
Marton Kiss 2015-02-03 14:26:54 +01:00
parent 93a07b0bcb
commit a6f349f2cb
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,10 +65,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'] ],
} }

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'] ]
} }