Merge pull request #429 from diLLec/master

Author: SimonHoenscheid

REFERENCE.md

@@ -80,6 +80,7 @@ The following parameters are available in the `jira` class:
 * [`jndi_ds_name`](#-jira--jndi_ds_name)
 * [`db`](#-jira--db)
 * [`dbname`](#-jira--dbname)
+* [`change_dbpassword`](#-jira--change_dbpassword)
 * [`dbuser`](#-jira--dbuser)
 * [`dbpassword`](#-jira--dbpassword)
 * [`dbserver`](#-jira--dbserver)
@@ -383,6 +384,14 @@ The database name to connect to
 
 Default value: `'jira'`
 
+##### <a name="-jira--change_dbpassword"></a>`change_dbpassword`
+
+Data type: `Boolean`
+
+Set to true to actually generate a dbconfig.xml with the password - otherwise write "{ATL_SECURED}"
+
+Default value: `false`
+
 ##### <a name="-jira--dbuser"></a>`dbuser`
 
 Data type: `String`

manifests/config.pp

@@ -48,6 +48,8 @@
     }
   }
 
+  $change_dbpassword = $jira::change_dbpassword
+
   if $jira::dbport {
     $dbport = $jira::dbport
   } else {

manifests/init.pp

@@ -68,6 +68,8 @@
 #   The kind of database to use.
 # @param dbname
 #   The database name to connect to
+# @param change_dbpassword
+#   Set to true to actually generate a dbconfig.xml with the password - otherwise write "{ATL_SECURED}"
 # @param dbuser
 #   Database username
 # @param dbpassword
@@ -313,6 +315,7 @@
   Boolean $use_jndi_ds                                              = false,
   String[1] $jndi_ds_name                                           = 'JiraDS',
   Enum['postgresql','mysql','sqlserver','oracle','h2'] $db          = 'postgresql',
+  Boolean $change_dbpassword                                        = false,
   String $dbuser                                                    = 'jiraadm',
   String $dbpassword                                                = 'mypassword',
   String $dbserver                                                  = 'localhost',

spec/acceptance/default_parameters_spec.rb

@@ -54,6 +54,7 @@ class { 'jira':
         java_package             => $java_package,
         javahome                 => $java_home,
         script_check_java_manage => true,
+        change_dbpassword        => true,
       }
     EOS
 
@@ -94,7 +95,11 @@ class { 'jira':
     it { is_expected.to have_login_shell '/bin/true' }
   end
 
-  describe command('wget -q --tries=24 --retry-connrefused --read-timeout=10 -O- localhost:8080') do
+  describe command('tail -100 ~jira/log/atlassian-jira.log') do
+    its(:stdout) { is_expected.to include('INFO') }
+  end
+
+  describe command('wget -q --tries=54 --retry-connrefused --read-timeout=10 -O- localhost:8080') do
     its(:stdout) { is_expected.to include('8.16.0') }
   end
 

spec/acceptance/mysql_spec.rb

@@ -77,6 +77,7 @@ class { 'jira':
         dbport                   => 3306,
         dbdriver                 => 'com.mysql.jdbc.Driver',
         dbtype                   => 'mysql',
+        change_dbpassword        => true,
         tomcat_port              => 8081,
         tomcat_native_ssl        => true,
         tomcat_keystore_file     => '/tmp/jira.ks',

spec/classes/jira_config_spec.rb

@@ -172,7 +172,8 @@
                 dbserver: 'TheSQLServer',
                 dbname: 'TheJiraDB',
                 dbuser: 'TheDBUser',
-                dbpassword: 'TheDBPassword'
+                dbpassword: 'TheDBPassword',
+                change_dbpassword: true
               )
             end
 
@@ -195,7 +196,8 @@
                 dbserver: 'TheSQLServer',
                 dbname: 'TheJiraDB',
                 dbuser: 'TheDBUser',
-                dbpassword: 'TheDBPassword'
+                dbpassword: 'TheDBPassword',
+                change_dbpassword: true
               )
             end
 
@@ -237,7 +239,8 @@
                 dbserver: 'TheSQLServer',
                 dbname: 'TheJiraDB',
                 dbuser: 'TheDBUser',
-                dbpassword: 'TheDBPassword'
+                dbpassword: 'TheDBPassword',
+                change_dbpassword: true
               )
             end
 

templates/dbconfig.xml.epp

@@ -12,44 +12,48 @@
     <url><%= $jira::config::dburl %></url>
     <driver-class><%= $jira::config::dbdriver %></driver-class>
     <username><%= $jira::dbuser %></username>
+    <%- if $jira::config::change_dbpassword { -%>
     <password><%= $jira::dbpassword %></password>
+    <%- } else { -%>
+    <password>{ATL_SECURED}</password>
+    <%- } -%>
 <%# For most of these, Jira defaults are better... -%>
 <% if $jira::config::pool_min_size != undef { -%>
     <pool-min-size><%= $jira::config::pool_min_size %></pool-min-size>
 <% } -%>
 <% if $jira::config::pool_max_size != undef { -%>
     <pool-max-size><%= $jira::config::pool_max_size %></pool-max-size>
 <% } -%>
-<% if $jira::config::pool_max_idle != undef { -%>
-    <pool-max-idle><%= $jira::config::pool_max_idle %></pool-max-idle>
-<% } -%>
 <% if $jira::config::pool_max_wait != undef { -%>
     <pool-max-wait><%= $jira::config::pool_max_wait %></pool-max-wait>
 <% } -%>
+<% if $jira::config::validation_query != undef { -%>
+    <validation-query><%= $jira::config::validation_query %></validation-query>
+<% } -%>
 <% if $jira::config::min_evictable_idle_time != undef { -%>
     <min-evictable-idle-time-millis><%= $jira::config::min_evictable_idle_time %></min-evictable-idle-time-millis>
 <% } -%>
+<% if $jira::config::time_between_eviction_runs != undef { -%>
+    <time-between-eviction-runs-millis><%= $jira::config::time_between_eviction_runs %></time-between-eviction-runs-millis>
+<% } -%>
+<% if $jira::config::pool_max_idle != undef { -%>
+    <pool-max-idle><%= $jira::config::pool_max_idle %></pool-max-idle>
+<% } -%>
 <% if $jira::config::pool_remove_abandoned != undef { -%>
     <pool-remove-abandoned><%= $jira::config::pool_remove_abandoned %></pool-remove-abandoned>
 <% } -%>
 <% if $jira::config::pool_remove_abandoned_timeout != undef { -%>
     <pool-remove-abandoned-timeout><%= $jira::config::pool_remove_abandoned_timeout %></pool-remove-abandoned-timeout>
 <% } -%>
-<% if $jira::config::pool_test_while_idle != undef { -%>
-    <pool-test-while-idle><%= $jira::config::pool_test_while_idle %></pool-test-while-idle>
-<% } -%>
 <% if $jira::config::pool_test_on_borrow != undef { -%>
     <pool-test-on-borrow><%= $jira::config::pool_test_on_borrow %></pool-test-on-borrow>
 <% } -%>
-<% if $jira::config::validation_query != undef { -%>
-    <validation-query><%= $jira::config::validation_query %></validation-query>
+<% if $jira::config::pool_test_while_idle != undef { -%>
+    <pool-test-while-idle><%= $jira::config::pool_test_while_idle %></pool-test-while-idle>
 <% } -%>
 <% if $jira::config::validation_query_timeout != undef { -%>
     <validation-query-timeout><%= $jira::config::validation_query_timeout %></validation-query-timeout>
 <% } -%>
-<% if $jira::config::time_between_eviction_runs != undef { -%>
-    <time-between-eviction-runs-millis><%= $jira::config::time_between_eviction_runs %></time-between-eviction-runs-millis>
-<% } -%>
 <% if $jira::config::connection_settings { -%>
     <connection-properties><%= $jira::config::connection_settings %></connection-properties>
 <% } -%>