Parameterize server OpenStack-isms

Make it possible to configure with LDAP or OPENID_SSO.
Also, it's possible to not want to need CLAs.

Change-Id: Ie6660c819f4078dd4dd5be052e74aaa98c54cab4
This commit is contained in:
Monty Taylor 2013-10-06 15:26:15 -04:00 committed by Gerrit Code Review
parent 334876ce8b
commit 54d0db2fea
2 changed files with 25 additions and 4 deletions

View File

@ -86,7 +86,15 @@ class gerrit(
$ssh_rsa_pubkey_contents = '', # If left empty puppet will not create file.
$ssh_project_rsa_key_contents = '', # If left empty will not create file.
$ssh_project_rsa_pubkey_contents = '', # If left empty will not create file.
$gerrit_auth_type = 'OPENID_SSO',
$gerrit_contributor_agreement = true,
$openidssourl = 'https://login.launchpad.net/+openid',
$ldap_server = '',
$ldap_account_base = '',
$ldap_username = '',
$ldap_password = '',
$ldap_account_pattern = '',
$ldap_account_email_address = '',
$email = '',
$database_poollimit = '',
$container_heaplimit = '',

View File

@ -12,12 +12,25 @@
<% if database_poollimit != "" -%>
poolLimit = <%= database_poollimit %>
<% end -%>
connectionpool = true
connectionpool = true
[auth]
type = OPENID_SSO
openIdSsoUrl = <%= openidssourl %>
cookieSecure = true
<% if gerrit_contributor_agreement -%>
contributorAgreements = true
<% end -%>
type = <%= gerrit_auth_type %>
cookieSecure = true
<% if gerrit_auth_type == 'OPENID_SSO' -%>
openIdSsoUrl = <%= openidssourl %>
<% end -%>
<% if gerrit_auth_type == 'LDAP' -%>
[ldap]
server = <%= ldap_server %>
accountBase = <%= ldap_account_base %>
username = <%= ldap_username %>
password = <%= ldap_password %>
accountPattern = <%= ldap_account_pattern %>
accountEmailAddress = <%= ldap_account_email_address %>
<% end %>
[sendemail]
smtpServer = localhost
[container]