recommit for updates in build 12

CHANGELOG.md

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 <h2> No issue </h2>
 
 
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/cb4b482e20b2be5">cb4b482e20b2be5</a> Arne Teuke <i>2017-08-03 14:56:00</i>
+<p>
+<h3>fixed controls for main conf/local files</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/6f0942201f20c66">6f0942201f20c66</a> Jenkins Server <i>2017-08-03 14:55:39</i>
+<p>
+<h3>recommit for updates in build 9</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/8c3df7530a1ab21">8c3df7530a1ab21</a> Arne Teuke <i>2017-08-03 14:51:29</i>
 <p>
 <h3>added controls for main conf/local files</h3>

REPOSTRUCTURE.md

@@ -33,7 +33,9 @@
 |   `-- params.pp
 |-- templates
 |   |-- fail2ban_conf.erb
-|   `-- fail2ban_local.erb
+|   |-- fail2ban_local.erb
+|   |-- jail_conf.erb
+|   `-- jail_local.erb
 |-- tests
 |   `-- UTF_Files
 |-- CHANGELOG.md
@@ -44,4 +46,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-8 directories, 36 files
+8 directories, 38 files

doc/_index.html

@@ -132,7 +132,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Aug  3 16:55:35 2017 by
+  Generated on Thu Aug  3 18:32:54 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

@@ -61,7 +61,7 @@
 <p>|Repo Name| version | Build
 Status|
 |---|---|---|---|
-|<code>cd_fail2ban</code>| 0.0.0.4 | <a
+|<code>cd_fail2ban</code>| 0.0.0.5 | <a
 href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_fail2ban">{Build
 Status</a>/]|</p>
 
@@ -251,7 +251,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Thu Aug  3 16:55:36 2017 by
+  Generated on Thu Aug  3 18:32:55 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

@@ -61,7 +61,7 @@
 <p>|Repo Name| version | Build
 Status|
 |---|---|---|---|
-|<code>cd_fail2ban</code>| 0.0.0.4 | <a
+|<code>cd_fail2ban</code>| 0.0.0.5 | <a
 href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_fail2ban">{Build
 Status</a>/]|</p>
 
@@ -251,7 +251,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Thu Aug  3 16:55:36 2017 by
+  Generated on Thu Aug  3 18:32:55 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 Thu Aug  3 16:55:36 2017 by
+  Generated on Thu Aug  3 18:32:56 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 Thu Aug  3 16:55:37 2017 by
+  Generated on Thu Aug  3 18:32:56 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 Thu Aug  3 16:55:37 2017 by
+  Generated on Thu Aug  3 18:32:56 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

@@ -168,7 +168,39 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 61
 62
 63
-64</pre>
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 23</span>
@@ -213,6 +245,38 @@ class cd_fail2ban::main::files (
       notify    =&gt;  Service[$fn_service],
     }
 
+    # manage  jail.conf
+
+    file { $fn_jail_conf_file:
+      ensure    =&gt;  present,
+      path      =&gt;  $fn_jail_conf_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_jail_conf_erb),
+      notify    =&gt;  Service[$fn_service],
+    }
+
+    # manage  jail.local
+
+    file { $fn_jail_local_file:
+      ensure    =&gt;  present,
+      path      =&gt;  $fn_jail_local_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_jail_local_erb),
+      notify    =&gt;  Service[$fn_service],
+    }
+
   }
 }</pre>
       </td>
@@ -222,7 +286,7 @@ class cd_fail2ban::main::files (
 </div>
 
       <div id="footer">
-  Generated on Thu Aug  3 16:55:37 2017 by
+  Generated on Thu Aug  3 18:32:56 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 Thu Aug  3 16:55:37 2017 by
+  Generated on Thu Aug  3 18:32:56 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 Thu Aug  3 16:55:37 2017 by
+  Generated on Thu Aug  3 18:32:57 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

@@ -333,6 +333,383 @@ database.</p>
         <div class='inline'>
 <p>age in seconds at which bans should be purged
 from the database.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_ignoreip</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;127.0.0.1/8&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>can be an IP address, a CIDR mask or a DNS host.
+Fail2ban will not ban a
+host which matches an address in this list. Several
+addresses can be
+defined using space (and/or comma) separator.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_ignorecommand</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>External command that will take an
+tagged arguments to ignore, e.g.
+&lt;ip&gt;,and return true if the IP is to be
+ignored. False otherwise.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_bantime</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;600&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>number of seconds that a host is banned.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_findtime</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;600&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>A host is banned if it has generated “maxretry”
+during the last
+&quot;findtime&quot; seconds.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_maxretry</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;5&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>number of failures before a host get banned.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_backend</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;auto&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>specifies the backend used to get files
+modification. options are
+&quot;pyinotify&quot;, &quot;gamin&quot;, &quot;polling&quot;,
+&quot;systemd&quot; and
+&quot;auto&quot;.
+pyinotify: requires pyinotify (a
+file alteration monitor) to be installed.
+ If pyinotify is not installed,
+Fail2ban will use auto.
+gamin: requires Gamin (a file alteration monitor)
+to be installed.
+ If Gamin is not installed, Fail2ban will use
+auto.
+polling: uses a polling algorithm which does not require external
+libraries.
+systemd: uses systemd python library to access the systemd
+journal.
+ Specifying &quot;logpath&quot; is not valid for this backend.
+
+See &quot;journalmatch&quot; in the jails associated filter config
+auto:
+will try to use the following backends, in order:
+ pyinotify, gamin,
+polling.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_usedns</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;warn&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>specifies if jails should trust hostnames in logs,
+warn when DNS lookups
+are performed, or ignore all hostnames in logs
+yes: if a hostname is
+encountered, a DNS lookup will be performed.
+warn: if a hostname is
+encountered, a DNS lookup will be performed,
+ but it will be logged as a
+warning.
+no: if a hostname is encountered, will not be used for banning,
+
+but it will be logged as info.
+raw: use raw value (no hostname), allow use
+it for no-host filters/actions
+(example user)</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_logencoding</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;auto&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>specifies the encoding of the log files
+handled by the jail This is used to
+decode the lines from the log file.
+Typical examples: &quot;ascii&quot;,
+&quot;utf-8&quot;
+auto: will use the system locale setting</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_enabled</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;false&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>enables the jails.
+By default all jails are disabled, and it should stay
+this way.
+Enable only relevant to your setup jails in your .local or
+jail.d/*.conf
+true: jail will be enabled and log files will get monitored
+for changes
+false: jail is not enabled</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_filter</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;%(__name__)s&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>defines the filter to use by the jail.
+By default jails have names matching
+their filter name</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_destemail</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;root@localhost&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Destination email address used solely for the
+interpolations in
+jail.conf,local,d/* configuration files.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_sender</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;root@localhost&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Sender email address used solely for some actions</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_mta</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;sendmail&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>E-mail action. Since 0.8.1 Fail2Ban uses sendmail MTA
+for the mailing.
+Change mta configuration parameter to mail if you want to
+revert to
+conventional &#39;mail&#39;.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_protocol</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;tcp&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Default protocol.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_chain</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;INPUT&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Specify chain where jumps would need to be added in
+iptables-* actions.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_port</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;0:65535&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<h1 id="label-Ports+to+be+banned+Usually+should+be+overridden">Ports to be banned Usually should be overridden</h1>
+
+<p>in a particular jail</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fn_fail2ban_agent</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;Fail2Ban/%(fail2ban_version)s&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Format of user-agent
+<a
+href="https://tools.ietf.org/html/rfc7231#section-5.5.3">tools.ietf.org/html/rfc7231#section-5.5.3</a></p>
 </div>
       
     </li>
@@ -347,57 +724,90 @@ from the database.</p>
         <pre class="lines">
 
 
-48
+104
-49
+105
-50
+106
-51
+107
-52
+108
-53
+109
-54
+110
-55
+111
-56
+112
-57
+113
-58
+114
-59
+115
-60
+116
-61
+117
-62
+118
-63
+119
-64
+120
-65
+121
-66
+122
-67
+123
-68
+124
-69
+125
-70
+126
-71
+127
-72
+128
-73
+129
-74
+130
-75
+131
-76
+132
-77
+133
-78
+134
-79
+135
-80
+136
-81
+137
-82
+138
-83
+139
-84
+140
-85
+141
-86
+142
-87
+143
-88
+144
-89
+145
-90
+146
-91
+147
-92
+148
-93
+149
-94
+150
-95</pre>
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 48</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 104</span>
 
 class cd_fail2ban::params (
 
@@ -405,6 +815,9 @@ $pkg_ensure             = &#39;latest&#39;,
 
 $fn_manage_config       = true,
 $fn_enable_service      = &#39;running&#39;,
+
+# fail2ban.conf/local
+
 $fn_loglevel            = &#39;INFO&#39;,
 $fn_logtarget           = &#39;SYSLOG&#39;,
 $fn_syslogsocket        = &#39;auto&#39;,
@@ -413,6 +826,25 @@ $fn_pidfile             = &#39;/var/run/fail2ban/fail2ban.pid&#39;,
 $fn_dbfile              = &#39;/var/lib/fail2ban/fail2ban.sqlite3&#39;,
 $fn_dbpurgeage          = &#39;86400&#39;,
 
+# jail.conf/local
+$fn_ignoreip            = &#39;127.0.0.1/8&#39;,
+$fn_ignorecommand       = &#39;&#39;,
+$fn_bantime             = &#39;600&#39;,
+$fn_findtime            = &#39;600&#39;,
+$fn_maxretry            = &#39;5&#39;,
+$fn_backend             = &#39;auto&#39;,
+$fn_usedns              = &#39;warn&#39;,
+$fn_logencoding         = &#39;auto&#39;,
+$fn_enabled             = &#39;false&#39;,
+$fn_filter              = &#39;%(__name__)s&#39;,
+$fn_destemail           = &#39;root@localhost&#39;,
+$fn_sender              = &#39;root@localhost&#39;,
+$fn_mta                 = &#39;sendmail&#39;,
+$fn_protocol            = &#39;tcp&#39;,
+$fn_chain               = &#39;INPUT&#39;,
+$fn_port                = &#39;0:65535&#39;,
+$fn_fail2ban_agent      = &#39;Fail2Ban/%(fail2ban_version)s&#39;,
+
 
 ) {
 
@@ -420,9 +852,15 @@ $fn_dbpurgeage          = &#39;86400&#39;,
 $reqpackages    = $::operatingsystem ? {
     /(?i-mx:centos|fedora|redhat)/ =&gt; [&#39;fail2ban&#39;,&#39;fail2ban-firewalld&#39;,
                                         &#39;fail2ban-sendmail&#39;,
-                                        &#39;fail2ban-server.noarch&#39;],
+                                        &#39;fail2ban-server.noarch&#39;,&#39;jwhois&#39;],
   }
 
+$fn_jail_paths    = $::operatingsystem ? {
+    /(?i-mx:centos|fedora|redhat)/ =&gt; &#39;fedora&#39;,
+  }
+
+# shortcuts
+$fn_os                  = $::operatingsystem
 
 # service
 $fn_service             = &#39;fail2ban&#39;
@@ -441,6 +879,11 @@ $fn_fail2ban_conf_file  = &quot;${fn_main_dir}/fail2ban.conf&quot;
 $fn_fail2ban_conf_erb   = &#39;cd_fail2ban/fail2ban_conf.erb&#39;
 $fn_fail2ban_local_file = &quot;${fn_main_dir}/fail2ban.local&quot;
 $fn_fail2ban_local_erb  = &#39;cd_fail2ban/fail2ban_local.erb&#39;
+$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;
+
 
 # includes must be last
 
@@ -454,7 +897,7 @@ $fn_fail2ban_local_erb  = &#39;cd_fail2ban/fail2ban_local.erb&#39;
 </div>
 
       <div id="footer">
-  Generated on Thu Aug  3 16:55:37 2017 by
+  Generated on Thu Aug  3 18:32:56 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 Thu Aug  3 16:55:36 2017 by
+  Generated on Thu Aug  3 18:32:55 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>

tests/UTF_Files

@@ -4,3 +4,4 @@
 ./.yardoc/objects/root.dat: data
 ./doc/css/style.css: HTML document, UTF-8 Unicode text, with very long lines
 ./doc/js/jquery.js: HTML document, UTF-8 Unicode text, with very long lines
+./doc/puppet_classes/cd_fail2ban_3A_3Aparams.html: HTML document, UTF-8 Unicode text