Added schema parameter for dbconfig

README.md

@@ -183,6 +183,12 @@ The database driver to use, defaults to 'org.postgresql.Driver'. Can be 'org.pos
 
 Database type, defaults to 'postgres72'. Can be 'postgres72', 'mysql', 'oracle10g', or 'mssql'. Atlassian only supports Oracle 11g, even so this value should be as documented here.
 
+#####`$dbschema`
+
+Set the schema 
+
+The Default value is 'public' 
+
 #####`$poolsize`
 
 The connection pool size to the database, defaults to 20

jira.yaml

@@ -59,6 +59,12 @@ jira::dbport: 5432
 #jira::dbport: 1521
 #jira::dbport: 1433
 
+# Schema
+# Defauult for postgres
+jira::dbschema: 'public'
+# Default for mssql
+#jira::dbschema: 'dbo'
+
 # The connection pool size
 jira::poolsize: 20
 jira::enable_connection_pooling: false

manifests/init.pp

@@ -55,6 +55,7 @@
   $dbtype                  = 'postgres72',
   $dburl                   = undef,
   $poolsize                = '20',
+  $dbschema                = 'public',
 
   # MySQL Connector Settings
   $mysql_connector_manage  = true,

spec/classes/jira_config_spec.rb

@@ -18,7 +18,8 @@
           it { should contain_file('/opt/jira/atlassian-jira-6.3.4a-standalone/bin/user.sh')}
           it { should contain_file('/opt/jira/atlassian-jira-6.3.4a-standalone/conf/server.xml')}
           it { should contain_file('/home/jira/dbconfig.xml')
-            .with_content(/<url>jdbc:postgresql:\/\/localhost:5432\/jira<\/url>/) }
+            .with_content(/<url>jdbc:postgresql:\/\/localhost:5432\/jira<\/url>/)
+            .with_content(/<schema-name>public<\/schema-name>/) }
         end
 
         context 'mysql params' do
@@ -40,12 +41,13 @@
             :javahome => '/opt/java',
             :db       => 'sqlserver',
             :dbport   => '1433',
+            :dbschema => 'public',
           }}
           it { should contain_file('/opt/jira/atlassian-jira-6.3.4a-standalone/bin/setenv.sh')}
           it { should contain_file('/opt/jira/atlassian-jira-6.3.4a-standalone/bin/user.sh')}
           it { should contain_file('/opt/jira/atlassian-jira-6.3.4a-standalone/conf/server.xml')}
           it { should contain_file('/home/jira/dbconfig.xml')
-            .with_content(/<url>jdbc:jtds:sqlserver:\/\/localhost:1433\/jira<\/url>/) }
+            .with_content(/<schema-name>public<\/schema-name>/) }
         end
 
         context 'custom dburl' do

templates/dbconfig.postgresql.xml.erb

@@ -4,7 +4,7 @@
   <name>defaultDS</name>
   <delegator-name>default</delegator-name>
   <database-type><%= scope.lookupvar('jira::dbtype') %></database-type>
-  <schema-name>public</schema-name>
+  <schema-name><%= scope.lookupvar('jira::dbschema') %></schema-name>
   <jdbc-datasource>
     <url><%= scope.lookupvar('jira::dburl_real') %></url>
     <driver-class><%= scope.lookupvar('jira::dbdriver') %></driver-class>

templates/dbconfig.sqlserver.xml.erb

@@ -4,7 +4,7 @@
   <name>defaultDS</name>
   <delegator-name>default</delegator-name>
   <database-type><%= scope.lookupvar('jira::dbtype') %></database-type>
-  <schema-name>dbo</schema-name>
+  <schema-name><%= scope.lookupvar('jira::dbschema') %></schema-name>
   <jdbc-datasource>
     <url><%= scope.lookupvar('jira::dburl_real') %></url>
     <driver-class><%= scope.lookupvar('jira::dbdriver') %></driver-class>