Merge branch 'jenkins-build-57' into 'master'

Auto-merge for build 57

See merge request puppet/postgresql_cd!40

doc/puppet_classes/postgresql_cd_3A_3Aparams.html

@@ -474,6 +474,24 @@
         —
         <div class='inline'>
 <p>the path for the postgres-exporter files</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>pl_idle_timeout</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;60000&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>idle_in_transaction_session_timeout</p>
 </div>
       
     </li>
@@ -489,7 +507,6 @@
         <pre class="lines">
 
 
-28
 29
 30
 31
@@ -540,10 +557,12 @@
 76
 77
 78
-79</pre>
+79
+80
+81</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 28</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 29</span>
 
 class postgresql_cd::params (
 
@@ -565,6 +584,7 @@ class postgresql_cd::params (
   String $pl_listen_address       = &#39;*&#39;,
   String $pl_listen_port          = &#39;5432&#39;,
   String $pl_max_conn             = &#39;100&#39;,
+  String $pl_idle_timeout         = &#39;60000&#39;,
   Boolean $pl_ssl_enabled         = false,
   String $pl_server_crt           = &#39;server.crt&#39;,
   String $pl_server_key           = &#39;server.key&#39;,

manifests/params.pp

@@ -24,6 +24,7 @@
 # @param [Boolean] pl_manage_extensions whether to manage extensions
 # @param [Boolean] pl_use_exporter whether to use the postgresql-exporter
 # @param [String] pl_install_dir  the path for the postgres-exporter files
+# @param [String] pl_idle_timeout  idle_in_transaction_session_timeout
 ##############################################################################
 class postgresql_cd::params (
 
@@ -45,6 +46,7 @@ class postgresql_cd::params (
   String $pl_listen_address       = '*',
   String $pl_listen_port          = '5432',
   String $pl_max_conn             = '100',
+  String $pl_idle_timeout         = '60000',
   Boolean $pl_ssl_enabled         = false,
   String $pl_server_crt           = 'server.crt',
   String $pl_server_key           = 'server.key',

templates/postgresql.conf.erb

@@ -116,6 +116,8 @@ ssl_key_file 	= '<%= @pl_data_dir %><%= @pl_server_key -%>'
 ssl = off
 <% end -%>
 
+idle_in_transaction_session_timeout = <%= @pl_idle_timeout %>
+
 #ssl_crl_file = ''
 #ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers
 #ssl_prefer_server_ciphers = on
@@ -674,7 +676,6 @@ log_timezone = 'Etc/UTC'
 #session_replication_role = 'origin'
 #statement_timeout = 0			# in milliseconds, 0 is disabled
 #lock_timeout = 0			# in milliseconds, 0 is disabled
-#idle_in_transaction_session_timeout = 0	# in milliseconds, 0 is disabled
 #vacuum_freeze_min_age = 50000000
 #vacuum_freeze_table_age = 150000000
 #vacuum_multixact_freeze_min_age = 5000000