Skip to content

add oracle ucp driver to jira module #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add oracle ucp driver to jira module #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56946c9
add oracle ucp support
Mar 20, 2023
4bd3e37
add oracle ucp pool driver
Mar 22, 2023
f6567ed
add trailing comma in init.pp
May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
# EHCache configuration for clustered mode
# @param use_jndi_ds
# If true, the database will be configured as JNDI datasource in server.xml and then referenced in dbconfig.xml
# @param use_ucp
# If true, the database will be configured with oracles ucp connection driver
# @param jndi_ds_name
# Configures the JNDI datasource name
# @param db
Expand Down Expand Up @@ -310,6 +312,7 @@
Optional[Stdlib::Port] $ehcache_object_port = undef,
# Database Settings
Boolean $use_jndi_ds = false,
Boolean $use_ucp = false,
String[1] $jndi_ds_name = 'JiraDS',
Enum['postgresql','mysql','sqlserver','oracle','h2'] $db = 'postgresql',
String $dbuser = 'jiraadm',
Expand Down Expand Up @@ -517,7 +520,7 @@
true => { password => $plugin_data['password'] }
}
$_plugin_archive = {
$target => $_target_defaults + $_username + $_password
$target => $_target_defaults + $_username + $_password,
}
create_resources(archive, $_plugin_archive)
}
Expand Down
13 changes: 13 additions & 0 deletions templates/server.xml.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,18 @@
factory="org.objectweb.jotm.UserTransactionFactory" jotm.timeout="60"/>
<% if $jira::use_jndi_ds { %>
<!-- If you're using JIRA 6.4 or below; change maxTotal to maxActive -->
<% if $jira::use_ucp { -%>
<Resource name="jdbc/<%= $jira::jndi_ds_name %>" auth="Container" type="oracle.ucp.jdbc.PoolDataSource"
factory="oracle.ucp.jdbc.PoolDataSourceImpl"
connectionFactoryClassName="oracle.jdbc.pool.OracleDataSource"
url="<%= $jira::config::dburl %>"
user="<%= $jira::dbuser %>"
password="<%= $jira::dbpassword %>"
maxTotal="<%= $jira::config::pool_max_size %>"
maxIdle="<%= $jira::config::pool_max_idle %>"
validationQuery="select 1"
/>
<% } else { -%>
<Resource name="jdbc/<%= $jira::jndi_ds_name %>" auth="Container" type="javax.sql.DataSource"
driverClassName="<%= $jira::config::dbdriver %>"
url="<%= $jira::config::dburl %>"
Expand All @@ -126,6 +138,7 @@
maxIdle="<%= $jira::config::pool_max_idle %>"
validationQuery="select 1"
/>
<% } -%>
<% } -%>
<Manager pathname=""/>
<JarScanner scanManifest="false"/>
Expand Down