Merge pull request #100 from kobybr/use-custom_jails-param

Use custom_jails parameter
voxpupuli · Dec 29, 2018 · b12a7ea · b12a7ea
2 parents e082a9f + 4893b84
commit b12a7ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -1,8 +1,6 @@
 # == Class: fail2ban::config
 #
 class fail2ban::config {
-  # Load custom jails definition
-  $config_custom_jails = hiera_hash('fail2ban::custom_jails', undef)
 
   file { 'fail2ban.dir':
     ensure  => $::fail2ban::config_dir_ensure,
@@ -30,9 +28,7 @@
   }
 
   # Custom jails definition
-  if $config_custom_jails {
-    create_resources('fail2ban::jail', $config_custom_jails)
-  }
+  create_resources('fail2ban::jail', $::fail2ban::custom_jails)
 
   # Operating system specific configuration
   case $facts['os']['family'] {

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -38,7 +38,7 @@
   Array[String[1]] $jails = ['ssh', 'ssh-ddos'],
   Integer[0] $maxretry = 3,
   Array $whitelist = ['127.0.0.1/8', '192.168.56.0/24'],
-  $custom_jails = undef,
+  Hash[String, Hash] $custom_jails = {},
   String[1] $banaction = 'iptables-multiport',
 ) inherits ::fail2ban::params {
   $config_file_content = default_content($config_file_string, $config_file_template)