opendev/system-config
Code Issues Proposed changes

Merge "Expands ldap to deal with nonstandard ldap configs."

Browse Source
This commit is contained in:
Jenkins 2014-01-25 02:44:00 +00:00 committed by Gerrit Code Review
commit a420237aa0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gerrit/manifests/init.pp
View File

@ -104,6 +104,9 @@ class gerrit(
$ldap_password = '', $ldap_password = '',
$ldap_account_pattern = '', $ldap_account_pattern = '',
$ldap_account_email_address = '', $ldap_account_email_address = '',
$ldap_sslverify = true,
$ldap_ssh_account_name = '',
$ldap_accountfullname = '',
$email = '', $email = '',
$smtpserver = 'localhost', $smtpserver = 'localhost',
$sendemail_from = 'MIXED', $sendemail_from = 'MIXED',

7
modules/gerrit/templates/gerrit.config.erb
View File

@ -26,10 +26,13 @@
[ldap] [ldap]
server = <%= ldap_server %> server = <%= ldap_server %>
accountBase = <%= ldap_account_base %> accountBase = <%= ldap_account_base %>
username = <%= ldap_username %> <% if ldap_username -%>username = <%= ldap_username %><%end%>
password = <%= ldap_password %> <% if ldap_password -%>password = <%= ldap_password %><%end%>
<% if ldap_accountfullname -%>accountFullName = <%= ldap_accountfullname %><%end%>
accountPattern = <%= ldap_account_pattern %> accountPattern = <%= ldap_account_pattern %>
accountEmailAddress = <%= ldap_account_email_address %> accountEmailAddress = <%= ldap_account_email_address %>
sslVerify = <%= ldap_sslverify %>
<% if @ldap_ssh_account_name -%>accountSshUserName = <%= ldap_ssh_account_name %><%end%>
<% end %> <% end %>
[sendemail] [sendemail]
smtpServer = <%= smtpserver %> smtpServer = <%= smtpserver %>