Merge branch 'jenkins' into 'master'

Jenkins

See merge request !9

CHANGELOG.md

@@ -8,6 +8,56 @@ Changelog of Git Changelog.
 <h2> No issue </h2>
 
 
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/7e856636a16ccf7">7e856636a16ccf7</a> Arne Teuke <i>2017-08-06 15:07:51</i>
+<p>
+<h3>adjusting multiline break</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/19cf115fce3293d">19cf115fce3293d</a> Jenkins Server <i>2017-08-06 15:07:25</i>
+<p>
+<h3>recommit for updates in build 21</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/36c79fcaf3d99fd">36c79fcaf3d99fd</a> Arne Teuke <i>2017-08-06 15:04:43</i>
+<p>
+<h3>adjusting multiline break</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/d1a208d5c4176f8">d1a208d5c4176f8</a> Arne Teuke <i>2017-08-06 15:01:46</i>
+<p>
+<h3>testing multiline break</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/df2a6fc42cf1609">df2a6fc42cf1609</a> Arne Teuke <i>2017-08-06 14:57:38</i>
+<p>
+<h3>testing multiline break</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/c54dc53df69bf1c">c54dc53df69bf1c</a> Arne Teuke <i>2017-08-06 14:52:24</i>
+<p>
+<h3>testing multiline break</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/329a1f904f45915">329a1f904f45915</a> Arne Teuke <i>2017-08-06 14:45:32</i>
+<p>
+<h3>testing multiline break</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/f99b81661229439">f99b81661229439</a> Arne Teuke <i>2017-08-06 14:38:42</i>
+<p>
+<h3>testing multiline break</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/fa4758835e44da1">fa4758835e44da1</a> Arne Teuke <i>2017-08-06 14:30:02</i>
+<p>
+<h3>finalized jail.local</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5361f997c9e1f20">5361f997c9e1f20</a> Arne Teuke <i>2017-08-05 13:03:52</i>
+<p>
+<h3>checking auto-carriage return</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/df59c3e85d59b32">df59c3e85d59b32</a> Arne Teuke <i>2017-08-03 16:33:22</i>
 <p>
 <h3>added more file controls</h3>

REPOSTRUCTURE.md

@@ -35,7 +35,8 @@
 |   |-- fail2ban_conf.erb
 |   |-- fail2ban_local.erb
 |   |-- jail_conf.erb
-|   `-- jail_local.erb
+|   |-- jail_local.erb
+|   `-- paths_common_conf.erb
 |-- tests
 |   `-- UTF_Files
 |-- CHANGELOG.md
@@ -46,4 +47,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-8 directories, 38 files
+8 directories, 39 files

doc/_index.html

@@ -132,7 +132,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sun Aug  6 17:07:20 2017 by
+  Generated on Sun Aug 13 16:27:08 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/file.README.html

@@ -251,7 +251,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Sun Aug  6 17:07:21 2017 by
+  Generated on Sun Aug 13 16:27:09 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/index.html

@@ -251,7 +251,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Sun Aug  6 17:07:21 2017 by
+  Generated on Sun Aug 13 16:27:08 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_fail2ban.html

@@ -139,7 +139,7 @@ class cd_fail2ban {
 </div>
 
       <div id="footer">
-  Generated on Sun Aug  6 17:07:22 2017 by
+  Generated on Sun Aug 13 16:27:09 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aconfig.html

@@ -153,7 +153,7 @@ class cd_fail2ban::main::config (
 </div>
 
       <div id="footer">
-  Generated on Sun Aug  6 17:07:23 2017 by
+  Generated on Sun Aug 13 16:27:10 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Adirs.html

@@ -350,7 +350,7 @@ class cd_fail2ban::main::dirs (
 </div>
 
       <div id="footer">
-  Generated on Sun Aug  6 17:07:22 2017 by
+  Generated on Sun Aug 13 16:27:09 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Afiles.html

@@ -200,7 +200,22 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 93
 94
 95
-96</pre>
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 23</span>
@@ -216,7 +231,7 @@ class cd_fail2ban::main::files (
     # manage fail2ban.conf
 
     file { $fn_fail2ban_conf_file:
-      ensure    =&gt;  present,
+      ensure    =&gt;  file,
       path      =&gt;  $fn_fail2ban_conf_file,
       owner     =&gt;  &#39;root&#39;,
       group     =&gt;  &#39;root&#39;,
@@ -232,7 +247,7 @@ class cd_fail2ban::main::files (
     # manage fail2ban.local
 
     file { $fn_fail2ban_local_file:
-      ensure    =&gt;  present,
+      ensure    =&gt;  file,
       path      =&gt;  $fn_fail2ban_local_file,
       owner     =&gt;  &#39;root&#39;,
       group     =&gt;  &#39;root&#39;,
@@ -248,7 +263,7 @@ class cd_fail2ban::main::files (
     # manage jail.conf
 
     file { $fn_jail_conf_file:
-      ensure    =&gt;  present,
+      ensure    =&gt;  file,
       path      =&gt;  $fn_jail_conf_file,
       owner     =&gt;  &#39;root&#39;,
       group     =&gt;  &#39;root&#39;,
@@ -264,7 +279,7 @@ class cd_fail2ban::main::files (
     # manage jail.local
 
     file { $fn_jail_local_file:
-      ensure    =&gt;  present,
+      ensure    =&gt;  file,
       path      =&gt;  $fn_jail_local_file,
       owner     =&gt;  &#39;root&#39;,
       group     =&gt;  &#39;root&#39;,
@@ -277,6 +292,21 @@ class cd_fail2ban::main::files (
       notify    =&gt;  Service[$fn_service],
     }
 
+    # manage paths-common.conf
+
+    file { $fn_paths_common_file:
+      ensure    =&gt;  file,
+      path      =&gt;  $fn_paths_common_file,
+      owner     =&gt;  &#39;root&#39;,
+      group     =&gt;  &#39;root&#39;,
+      mode      =&gt;  &#39;0640&#39;,
+      selrange  =&gt;  s0,
+      selrole   =&gt;  object_r,
+      seltype   =&gt;  etc_t,
+      seluser   =&gt;  system_u,
+      content   =&gt;  template($fn_paths_common_erb),
+      notify    =&gt;  Service[$fn_service],
+    }
   }
 }</pre>
       </td>
@@ -286,7 +316,7 @@ class cd_fail2ban::main::files (
 </div>
 
       <div id="footer">
-  Generated on Sun Aug  6 17:07:22 2017 by
+  Generated on Sun Aug 13 16:27:10 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Ainstall.html

@@ -159,7 +159,7 @@ class cd_fail2ban::main::install (
 </div>
 
       <div id="footer">
-  Generated on Sun Aug  6 17:07:23 2017 by
+  Generated on Sun Aug 13 16:27:10 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aservice.html

@@ -166,7 +166,7 @@ class cd_fail2ban::main::service (
 </div>
 
       <div id="footer">
-  Generated on Sun Aug  6 17:07:23 2017 by
+  Generated on Sun Aug 13 16:27:10 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_fail2ban_3A_3Aparams.html

@@ -1026,7 +1026,9 @@ reporting service API</p>
 212
 213
 214
-215</pre>
+215
+216
+217</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 121</span>
@@ -1082,6 +1084,7 @@ $fn_action_badips           = &#39;badips.py[category=&quot;%(__name__)s&quot;,
 $fn_action_badips_report    = &#39;badips[category=&quot;%(__name__)s&quot;, agent=&quot;%(fail2ban_agent)s&quot;]&#39;,
 $fn_default_action          = &#39;action_&#39;,
 
+
 ) {
 
 # installation section
@@ -1119,7 +1122,8 @@ $fn_jail_conf_file      = &quot;${fn_main_dir}/jail.conf&quot;
 $fn_jail_conf_erb       = &#39;cd_fail2ban/jail_conf.erb&#39;
 $fn_jail_local_file     = &quot;${fn_main_dir}/jail.local&quot;
 $fn_jail_local_erb      = &#39;cd_fail2ban/jail_local.erb&#39;
-
+$fn_paths_common_file   = &quot;${fn_main_dir}/paths-common.conf&quot;
+$fn_paths_common_erb    = &#39;cd_fail2ban/paths_common_conf.erb&#39;
 
 # includes must be last
 
@@ -1133,7 +1137,7 @@ $fn_jail_local_erb      = &#39;cd_fail2ban/jail_local.erb&#39;
 </div>
 
       <div id="footer">
-  Generated on Sun Aug  6 17:07:22 2017 by
+  Generated on Sun Aug 13 16:27:09 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/top-level-namespace.html

@@ -90,7 +90,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sun Aug  6 17:07:21 2017 by
+  Generated on Sun Aug 13 16:27:09 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

manifests/main/files.pp

@@ -31,7 +31,7 @@ class cd_fail2ban::main::files (
     # manage fail2ban.conf
 
     file { $fn_fail2ban_conf_file:
-      ensure    =>  present,
+      ensure    =>  file,
       path      =>  $fn_fail2ban_conf_file,
       owner     =>  'root',
       group     =>  'root',
@@ -47,7 +47,7 @@ class cd_fail2ban::main::files (
     # manage fail2ban.local
 
     file { $fn_fail2ban_local_file:
-      ensure    =>  present,
+      ensure    =>  file,
       path      =>  $fn_fail2ban_local_file,
       owner     =>  'root',
       group     =>  'root',
@@ -63,7 +63,7 @@ class cd_fail2ban::main::files (
     # manage jail.conf
 
     file { $fn_jail_conf_file:
-      ensure    =>  present,
+      ensure    =>  file,
       path      =>  $fn_jail_conf_file,
       owner     =>  'root',
       group     =>  'root',
@@ -79,7 +79,7 @@ class cd_fail2ban::main::files (
     # manage jail.local
 
     file { $fn_jail_local_file:
-      ensure    =>  present,
+      ensure    =>  file,
       path      =>  $fn_jail_local_file,
       owner     =>  'root',
       group     =>  'root',
@@ -92,5 +92,20 @@ class cd_fail2ban::main::files (
       notify    =>  Service[$fn_service],
     }
 
+    # manage paths-common.conf
+
+    file { $fn_paths_common_file:
+      ensure    =>  file,
+      path      =>  $fn_paths_common_file,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0640',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  etc_t,
+      seluser   =>  system_u,
+      content   =>  template($fn_paths_common_erb),
+      notify    =>  Service[$fn_service],
+    }
   }
 }

manifests/params.pp

@@ -169,6 +169,7 @@ $fn_action_badips           = 'badips.py[category="%(__name__)s", banaction="%(b
 $fn_action_badips_report    = 'badips[category="%(__name__)s", agent="%(fail2ban_agent)s"]',
 $fn_default_action          = 'action_',
 
+
 ) {
 
 # installation section
@@ -206,7 +207,8 @@ $fn_jail_conf_file      = "${fn_main_dir}/jail.conf"
 $fn_jail_conf_erb       = 'cd_fail2ban/jail_conf.erb'
 $fn_jail_local_file     = "${fn_main_dir}/jail.local"
 $fn_jail_local_erb      = 'cd_fail2ban/jail_local.erb'
-
+$fn_paths_common_file   = "${fn_main_dir}/paths-common.conf"
+$fn_paths_common_erb    = 'cd_fail2ban/paths_common_conf.erb'
 
 # includes must be last
 

templates/paths_common_conf.erb

@@ -0,0 +1,79 @@
+################################################################################
+##########           paths-common.conf managed by Puppet              ##########
+##########            manual changes will be overwritten !!!          ##########
+################################################################################
+##########              full reference available under                ##########
+########## https://confdroid.com/2017/08/fail2ban-paths-common-conf/  ##########
+################################################################################
+[INCLUDES]
+
+after  = paths-overrides.local
+
+[DEFAULT]
+default_backend = auto
+
+sshd_log = %(syslog_authpriv)s
+sshd_backend = %(default_backend)s
+
+dropbear_log = %(syslog_authpriv)s
+dropbear_backend = %(default_backend)s
+
+# There is no sensible generic defaults for syslog log targets, thus
+# leaving them empty here so that no errors while parsing/interpolating configs
+syslog_daemon =
+syslog_ftp =
+syslog_local0 =
+syslog_mail_warn =
+syslog_user =
+# Set the default syslog backend target to default_backend
+syslog_backend = %(default_backend)s
+
+# from /etc/audit/auditd.conf
+auditd_log = /var/log/audit/audit.log
+exim_main_log = /var/log/exim/mainlog
+nginx_error_log = /var/log/nginx/*error.log
+nginx_access_log = /var/log/nginx/*access.log
+lighttpd_error_log = /var/log/lighttpd/error.log
+
+# http://www.hardened-php.net/suhosin/configuration.html#suhosin.log.syslog.facility
+# syslog_user is the default. Lighttpd also hooks errors into its log.
+
+suhosin_log = %(syslog_user)s
+              %(lighttpd_error_log)s
+
+# defaults to ftp or local2 if ftp doesn't exist
+proftpd_log = %(syslog_ftp)s
+proftpd_backend = %(default_backend)s
+
+# http://svnweb.freebsd.org/ports/head/ftp/proftpd/files/patch-src_proftpd.8.in?view=markup
+# defaults to ftp but can be overwritten.
+pureftpd_log = %(syslog_ftp)s
+pureftpd_backend = %(default_backend)s
+
+# ftp, daemon and then local7 are tried at configure time however it is overwriteable at configure time
+#
+wuftpd_log = %(syslog_ftp)s
+wuftpd_backend = %(default_backend)s
+
+# syslog_enable defaults to no. so it defaults to vsftpd_log_file setting of /var/log/vsftpd.log
+# No distro seems to set it to syslog by default
+# If syslog set it defaults to ftp facility if exists at compile time otherwise falls back to daemonlog.
+vsftpd_log = /var/log/vsftpd.log
+
+# Technically syslog_facility in main.cf can overwrite but no-one sane does this.
+postfix_log = %(syslog_mail_warn)s
+postfix_backend = %(default_backend)s
+
+dovecot_log = %(syslog_mail_warn)s
+dovecot_backend = %(default_backend)s
+
+# Seems to be set at compile time only to LOG_LOCAL0 (src/const.h) at Notice level
+solidpop3d_log = %(syslog_local0)s
+
+mysql_log = %(syslog_daemon)s
+mysql_backend = %(default_backend)s
+
+roundcube_errors_log = /var/log/roundcube/errors
+
+# Directory with ignorecommand scripts
+ignorecommands_dir = /etc/fail2ban/filter.d/ignorecommands