From 0a3c279c6505479a69635a836e4bc4f2564aabab Mon Sep 17 00:00:00 2001
From: Tommy McNeely <thomas.mcneely@davita.com>
Date: Thu, 5 Jul 2018 11:11:34 -0600
Subject: [PATCH] Update Readme and fix sqlserver default dbdriver

---
 README.md         | 7 ++++++-
 jira.yaml         | 2 +-
 manifests/init.pp | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 895508de..250de6ae 100644
--- a/README.md
+++ b/README.md
@@ -232,6 +232,7 @@ The port of the database, defaults to an appropriate port for the $db:
 |------|--------|
 | postgresql | 5432 |
 | mysql | 3306 |
+| oracle | 1521 |
 | sqlserver | 1443 |
 | h2 | N/A |
 
@@ -243,9 +244,12 @@ The database driver to use, defaults to an appropriate value for $db:
 |------|--------|
 | postgresql | org.postgresql.Driver |
 | mysql | com.mysql.jdbc.Driver |
-| sqlserver | net.sourceforge.jtds.jdbc.Driver |
+| oracle | oracle.jdbc.OracleDriver (*) |
+| sqlserver | com.microsoft.sqlserver.jdbc.SQLServerDriver |
 | h2 | org.h2.Driver |
 
+(*) NOTE: You must add the Oracle JDBC Driver manually with recent versions of JIRA (for now).
+See: https://confluence.atlassian.com/doc/database-jdbc-drivers-171742.html
 
 ##### `$dbtype`
 
@@ -255,6 +259,7 @@ Database type, defaults to an appropriate value for $db:
 |------|--------|
 | postgresql | postgresql72 |
 | mysql | mysql |
+| oracle | oracle10g |
 | sqlserver | mssql |
 | h2 | h2 |
 
diff --git a/jira.yaml b/jira.yaml
index 3ddde1b0..75747fdd 100644
--- a/jira.yaml
+++ b/jira.yaml
@@ -46,7 +46,7 @@ jira::dbtype: postgres72
 
 jira::dbdriver: org.postgresql.Driver
 #jira::dbdriver: com.mysql.jdbc.Driver
-#jira::dbdriver: net.sourceforge.jtds.jdbc.Driver
+#jira::dbdriver: com.microsoft.sqlserver.jdbc.SQLServerDriver
 
 # Change these values to your jira database credentials
 jira::dbuser: jiraadm
diff --git a/manifests/init.pp b/manifests/init.pp
index 3cfc88d1..babba491 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -207,7 +207,7 @@
       'postgresql' => 'org.postgresql.Driver',
       'mysql'      => 'com.mysql.jdbc.Driver',
       'oracle'     => 'oracle.jdbc.OracleDriver',
-      'sqlserver'  => 'net.sourceforge.jtds.jdbc.Driver',
+      'sqlserver'  => 'com.microsoft.sqlserver.jdbc.SQLServerDriver',
       'h2'         => 'org.h2.Driver',
     }
   }