opendev/puppet-zanata
Code Issues Proposed changes

Merge "Add OpenID login provider support to Zanata config"

Browse Source
This commit is contained in:
Jenkins 2015-04-07 19:02:49 +00:00 committed by Gerrit Code Review
commit aa25be34df
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -32,6 +32,8 @@ class zanata(
$zanata_default_from_address = '',
$zanata_storage_dir = '/home/wildfly/zanata',
$zanata_openid_provider_url = '',
$zanata_admin_users = '',
) {

22
templates/standalone.xml.erb
View File

@ -163,9 +163,9 @@
</pool>
<security>
<user-name><%= @zanata_db_username %></user-name>
<% if @zanata_db_password != '' -%>
<% if @zanata_db_password != '' -%>
<password><%= @zanata_db_password %></password>
<% end -%>
<% end -%>
</security>
<statement>
<track-statements>NOWARN</track-statements>
@ -413,14 +413,19 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:naming:2.0">
<bindings>
<% if @zanata_openid_provider_url == '' -%>
<simple name="java:global/zanata/security/auth-policy-names/internal" value="zanata.internal"/>
<% end -%>
<simple name="java:global/zanata/security/auth-policy-names/openid" value="zanata.openid"/>
<!--<simple name="java:global/zanata/security/admin-users" value=""/>-->
<% if @zanata_admin_users != '' -%>
<simple name="java:global/zanata/security/admin-users" value="<%= @zanata_admin_users %>"/>
<% else -%>
<simple name="java:global/zanata/security/admin-users" value="admin"/>
<% end -%>
<simple name="java:global/zanata/files/document-storage-directory" value="<%= @zanata_storage_dir %>/files"/>
<% if @zanata_default_from_address != '' -%>
<% if @zanata_default_from_address != '' -%>
<simple name="java:global/zanata/email/default-from-address" value="<%= @zanata_default_from_address %>"/>
<% end -%>
<% end -%>
</bindings>
<remote-naming/>
</subsystem>
@ -445,7 +450,12 @@
</security-domain>
<security-domain name="zanata.openid">
<authentication>
<login-module code="org.zanata.security.OpenIdLoginModule" flag="required"/>
<login-module code="org.zanata.security.OpenIdLoginModule" flag="required">
<% if @zanata_openid_provider_url != '' -%>
<module-option name="providerURL" value="<%= @zanata_openid_provider_url %>" />
<% end -%>
</login-module>
</authentication>
</security-domain>
<security-domain name="zanata.jaas">