opendev/system-config
Code Issues Proposed changes

Merge "Add groups portal openid url"

Browse Source
This commit is contained in:
Jenkins 2014-11-07 09:08:44 +00:00 committed by Gerrit Code Review
commit 110f5fbf5e
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/drupal/manifests/init.pp
View File

@ -71,6 +71,7 @@ class drupal (
$conf_cron_key = undef, $conf_cron_key = undef,
$conf_markdown_directory = undef, $conf_markdown_directory = undef,
$conf_ga_account = undef, $conf_ga_account = undef,
$conf_openid_provider = undef,
) { ) {
include apache include apache
include pear include pear

3
modules/drupal/templates/settings.php.erb
View File

@ -14,4 +14,7 @@ $conf['groups_feeds_markdown_directory'] = '<%= @conf_markdown_directory %>';
<% end %> <% end %>
<% if @conf_ga_account %> <% if @conf_ga_account %>
$conf['googleanalytics_account'] = '<%= @conf_ga_account %>'; $conf['googleanalytics_account'] = '<%= @conf_ga_account %>';
<% end %>
<% if @conf_openid_provider %>
$conf['groups_openid_provider'] = '<%= @conf_openid_provider %>';
<% end %> <% end %>

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

@ -55,6 +55,7 @@ class openstack_project::groups (
conf_cron_key => $conf_cron_key, conf_cron_key => $conf_cron_key,
conf_markdown_directory => '/srv/groups-static-pages', conf_markdown_directory => '/srv/groups-static-pages',
conf_ga_account => 'UA-17511903-1', conf_ga_account => 'UA-17511903-1',
conf_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'] ],
} }

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

@ -56,6 +56,7 @@ class openstack_project::groups_dev (
package_branch => 'dev', package_branch => 'dev',
conf_cron_key => $conf_cron_key, conf_cron_key => $conf_cron_key,
conf_markdown_directory => '/srv/groups-static-pages', conf_markdown_directory => '/srv/groups-static-pages',
conf_openid_provider => 'https://openstackid-dev.openstack.org',
require => [ Class['openstack_project::server'], require => [ Class['openstack_project::server'],
Vcsrepo['/srv/groups-static-pages'] ] Vcsrepo['/srv/groups-static-pages'] ]
} }