From 8c3df7530a1ab212e0c4e06a3ae904d30e36172c Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 3 Aug 2017 15:51:29 +0100 Subject: [PATCH 1/2] added controls for main conf/local files --- manifests/params.pp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index ed4811e..401965e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -70,7 +70,6 @@ $reqpackages = $::operatingsystem ? { } - # service $fn_service = 'fail2ban' @@ -84,9 +83,9 @@ $fn_var_lib_dir = '/var/lib/fail2ban' $fn_var_run_dir = '/var/run/fail2ban' # files -$fn_fail2ban_conf_file = "${fn_main_dir}fail2ban.conf" +$fn_fail2ban_conf_file = "${fn_main_dir}/fail2ban.conf" $fn_fail2ban_conf_erb = 'cd_fail2ban/fail2ban_conf.erb' -$fn_fail2ban_local_file = "${fn_main_dir}fail2ban.local" +$fn_fail2ban_local_file = "${fn_main_dir}/fail2ban.local" $fn_fail2ban_local_erb = 'cd_fail2ban/fail2ban_local.erb' # includes must be last From 21086d1f714fd6aadd6c5d5627b0c1886618658a Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 3 Aug 2017 16:51:10 +0200 Subject: [PATCH 2/2] recommit for updates in build 8 --- CHANGELOG.md | 10 ++++++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_fail2ban.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Afiles.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Aservice.html | 2 +- doc/puppet_classes/cd_fail2ban_3A_3Aparams.html | 10 ++++------ doc/top-level-namespace.html | 2 +- 12 files changed, 24 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fb548a..3819875 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+202c50762d6411e Arne Teuke 2017-08-03 14:29:17 +

+

added controls for main conf/local files

+ +

+a22f3fb29e72361 Jenkins Server 2017-08-03 14:28:57 +

+

recommit for updates in build 7

+ +

3fdfda26d55dc96 Jenkins Server 2017-08-03 13:10:45

recommit for updates in build 6

diff --git a/doc/_index.html b/doc/_index.html index b21ade1..91e691c 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -132,7 +132,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 1a1160e..e9ef17a 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -251,7 +251,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index e8815cd..78f1e28 100644 --- a/doc/index.html +++ b/doc/index.html @@ -251,7 +251,7 @@ environments.

diff --git a/doc/puppet_classes/cd_fail2ban.html b/doc/puppet_classes/cd_fail2ban.html index d998ea2..18aa670 100644 --- a/doc/puppet_classes/cd_fail2ban.html +++ b/doc/puppet_classes/cd_fail2ban.html @@ -139,7 +139,7 @@ class cd_fail2ban { diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aconfig.html index 086a584..dba1c5b 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aconfig.html @@ -153,7 +153,7 @@ class cd_fail2ban::main::config ( diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Adirs.html index 4adb85a..715de5b 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Adirs.html @@ -350,7 +350,7 @@ class cd_fail2ban::main::dirs ( diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Afiles.html index 67c717c..d964416 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Afiles.html @@ -222,7 +222,7 @@ class cd_fail2ban::main::files ( 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 0abcedc..e676cd0 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Ainstall.html @@ -159,7 +159,7 @@ class cd_fail2ban::main::install ( diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aservice.html b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aservice.html index 3fdc1a7..16fb887 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aservice.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aservice.html @@ -166,7 +166,7 @@ class cd_fail2ban::main::service ( diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html b/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html index 00d5aa6..db1e012 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html @@ -394,8 +394,7 @@ from the database.

92 93 94 -95 -96 +95 
# File 'manifests/params.pp', line 48
@@ -425,7 +424,6 @@ $reqpackages  = $::operatingsystem ? {
   }
 
 
-
 # service
 $fn_service             = 'fail2ban'
 
@@ -439,9 +437,9 @@ $fn_var_lib_dir         = '/var/lib/fail2ban'
 $fn_var_run_dir         = '/var/run/fail2ban'
 
 # files
-$fn_fail2ban_conf_file  = "${fn_main_dir}fail2ban.conf"
+$fn_fail2ban_conf_file  = "${fn_main_dir}/fail2ban.conf"
 $fn_fail2ban_conf_erb   = 'cd_fail2ban/fail2ban_conf.erb'
-$fn_fail2ban_local_file = "${fn_main_dir}fail2ban.local"
+$fn_fail2ban_local_file = "${fn_main_dir}/fail2ban.local"
 $fn_fail2ban_local_erb  = 'cd_fail2ban/fail2ban_local.erb'
 
 # includes must be last
@@ -456,7 +454,7 @@ $fn_fail2ban_local_erb  = 'cd_fail2ban/fail2ban_local.erb'
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 0410a43..0b3dca7 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@