From cce6205cf0906f75dd30840dde6fb982d5268b09 Mon Sep 17 00:00:00 2001
From: Tim Meusel
You maybe wonder what happend to release 1.1.0 and 1.0.0. We had to take them +down because they contained sensitive information.
+This is very easy:
diff --git a/docs/index.html b/docs/index.html index 12f972f..574b0e9 100644 --- a/docs/index.html +++ b/docs/index.html @@ -71,6 +71,7 @@You maybe wonder what happend to release 1.1.0 and 1.0.0. We had to take them +down because they contained sensitive information.
+This is very easy:
diff --git a/docs/puppet_classes/ferm.html b/docs/puppet_classes/ferm.html index 74c4b67..cbabd5c 100644 --- a/docs/puppet_classes/ferm.html +++ b/docs/puppet_classes/ferm.html @@ -150,6 +150,23 @@ Allowed values: Stdlib::Absolutepath +disable/enable the generation of conntrack rules +Default value: false +Allowed values: (true|false)
+-31 -32 -33 34 35 36 @@ -252,15 +266,20 @@ Allowed value: Any Hash 52 53 54 -55+55 +56 +57 +58 +59
# File 'manifests/init.pp', line 31
+ # File 'manifests/init.pp', line 34
class ferm (
Boolean $manage_service,
Boolean $manage_configfile,
Stdlib::Absolutepath $configfile,
+ Boolean $disable_conntrack,
Ferm::Policies $forward_policy,
Ferm::Policies $output_policy,
Ferm::Policies $input_policy,
diff --git a/docs/puppet_classes/ferm_3A_3Aconfig.html b/docs/puppet_classes/ferm_3A_3Aconfig.html
index 3d9813e..139230c 100644
--- a/docs/puppet_classes/ferm_3A_3Aconfig.html
+++ b/docs/puppet_classes/ferm_3A_3Aconfig.html
@@ -131,7 +131,10 @@
43
44
45
-46
+46
+47
+48
+49
# File 'manifests/config.pp', line 3
@@ -171,13 +174,16 @@ class ferm::config {
}
ferm::chain{'INPUT':
- policy => $ferm::input_policy,
+ policy => $ferm::input_policy,
+ disable_conntrack => $ferm::disable_conntrack,
}
ferm::chain{'FORWARD':
- policy => $ferm::forward_policy,
+ policy => $ferm::forward_policy,
+ disable_conntrack => $ferm::disable_conntrack,
}
ferm::chain{'OUTPUT':
- policy => $ferm::output_policy,
+ policy => $ferm::output_policy,
+ disable_conntrack => $ferm::disable_conntrack,
}
}
disable/enable usage of conntrack
+-4 5 6 7 @@ -138,13 +152,21 @@ 17 18 19 -20+20 +21 +22 +23 +24 +25 +26 +27
# File 'manifests/chain.pp', line 4 +# File 'manifests/chain.pp', line 5 define ferm::chain ( Ferm::Policies $policy, + Boolean $disable_conntrack, Ferm::Chains $chain = $name, ) { @@ -156,7 +178,12 @@ define ferm::chain ( concat::fragment{"${chain}-policy": target => "/etc/ferm.d/chains/${chain}.conf", - content => epp("${module_name}/ferm_chain_header.conf.epp", {'policy' => $policy }), + content => epp( + "${module_name}/ferm_chain_header.conf.epp", { + 'policy' => $policy, + 'disable_conntrack' => $disable_conntrack, + } + ), order => '01', } }-- cgit v1.2.3 From 299321eca9e48c9a4f8d9a348b1e7c8abc275885 Mon Sep 17 00:00:00 2001 From: Tim MeuselDate: Sat, 17 Mar 2018 19:59:55 +0100 Subject: release 1.2.0 --- CHANGELOG.md | 13 +++++++++++++ metadata.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 142a9ac..c192e3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. +## [v1.2.0](https://github.com/voxpupuli/puppet-ferm/tree/v1.2.0) (2018-03-17) + +[Full Changelog](https://github.com/voxpupuli/puppet-ferm/compare/v1.1.1...v1.2.0) + +**Implemented enhancements:** + +- Make usage of conntrack optional [\#9](https://github.com/voxpupuli/puppet-ferm/issues/9) +- introduce parameter disable\_conntrack [\#10](https://github.com/voxpupuli/puppet-ferm/pull/10) ([kBite](https://github.com/kBite)) + +**Merged pull requests:** + +- release 1.1.1 [\#8](https://github.com/voxpupuli/puppet-ferm/pull/8) ([bastelfreak](https://github.com/bastelfreak)) + ## [v1.1.1](https://github.com/voxpupuli/puppet-ferm/tree/v1.1.1) (2018-03-15) [Full Changelog](https://github.com/voxpupuli/puppet-ferm/compare/2d355a4c1baadc761d6b12645d0274da8866f722...v1.1.1) diff --git a/metadata.json b/metadata.json index d1de326..256cd7d 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-ferm", - "version": "1.1.2-rc0", + "version": "1.2.0", "author": "Vox Pupuli", "summary": "deploy and manage ferm", "license": "AGPL-3.0", -- cgit v1.2.3