diff --git a/CHANGELOG.md b/CHANGELOG.md index a276ed9..34c8df4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+35043067cf4420c Jenkins ConfDroid 2019-04-10 18:43:58 +

+

recommit for updates in build 4

+ +

+3cb35499148764f Arne Teuke 2019-04-10 18:43:25 +

+

removes firewall control

+ +

85bf9610f328a1b Jenkins ConfDroid 2019-04-10 18:21:34

recommit for updates in build 3

diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Ainstall.html index c6fbfbd..0a7f1a0 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Ainstall.html @@ -126,7 +126,20 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

30 31 32 -33 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46
# File 'manifests/main/install.pp', line 24
@@ -137,8 +150,21 @@ class cd_fail2ban::main::install (
 
   require cd_resources
 
-  package {$reqpackages:
-    ensure => $pkg_ensure,
+  if $::operatingsystemmajrelease != '8' {
+    package {$reqpackages:
+      ensure => $pkg_ensure,
+    }
+  }
+
+  if $::operatingsystemmajrelease == '8' {
+    package {$fn_extra_repo_url:
+      ensure  => present,
+    }
+
+    package {$reqpackages:
+      ensure  => $pkg_ensure,
+      require =>  Package[$fn_extra_repo_url],
+    }
   }
 }
diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html b/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html index 66c569d..4871013 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html @@ -145,6 +145,26 @@ type to choose, i.e. latest or present.

+
  • + + reqpackages + + + (array) + + + (defaults to: ['fail2ban','fail2ban-firewalld', + 'fail2ban-sendmail','fail2ban-server.noarch', + 'whois']) + + + — +
    +

    the packages to install.

    +
    + +
  • +
  • fn_manage_config @@ -837,6 +857,19 @@ log lines.

    Choose default action.

    +
  • + +
  • + + fn_extra_repo_url + + + (Any) + + + (defaults to: 'http://repo.okay.com.mx/centos/8/x86_64/release/okay-release-1-1.noarch.rpm') + +
  • @@ -862,7 +895,6 @@ log lines.

     
     
    -121
     122
     123
     124
    @@ -961,11 +993,17 @@ log lines.

    217
    -
    # File 'manifests/params.pp', line 121
    +        
    # File 'manifests/params.pp', line 122
     
     class cd_fail2ban::params (
     
    +# installation
     $pkg_ensure                 = 'latest',
    +$reqpackages                = ['fail2ban','fail2ban-firewalld',
    +                              'fail2ban-sendmail','fail2ban-server.noarch',
    +                              'whois'],
    +# urls 
    +$fn_extra_repo_url          = 'http://repo.okay.com.mx/centos/8/x86_64/release/okay-release-1-1.noarch.rpm',
     
     $fn_manage_config           = true,
     $fn_enable_service          = 'running',
    @@ -1017,13 +1055,6 @@ $fn_default_action          = 'action_',
     
     ) {
     
    -# installation section
    -$reqpackages    = $::operatingsystem ? {
    -    /(?i-mx:centos|fedora|redhat)/ => ['fail2ban','fail2ban-firewalld',
    -                                        'fail2ban-sendmail',
    -                                        'fail2ban-server.noarch','whois'],
    -  }
    -
     $fn_jail_paths    = $::operatingsystem ? {
         /(?i-mx:centos|fedora|redhat)/ => 'fedora',
       }