aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Meusel <tim@bastelfreak.de>2019-10-01 16:10:14 +0200
committerGitHub <noreply@github.com>2019-10-01 16:10:14 +0200
commit6c1a735df3fe28a877009b4fef0db33eb7106e56 (patch)
tree67eed982b65c8f663d4ce5e987c828430569e7c0
parent631b6ae7d342eaa113833b62d0462dcccdced8f4 (diff)
parent19c71d9abd269d88450f54ddb95e036c804a8fe8 (diff)
downloadpuppet-ferm-6c1a735df3fe28a877009b4fef0db33eb7106e56.tar.gz
puppet-ferm-6c1a735df3fe28a877009b4fef0db33eb7106e56.tar.bz2
Merge pull request #81 from bastelfreak/hotifx
disable conntrack filtering in FORWARD/OUTPUT
-rw-r--r--manifests/config.pp4
-rw-r--r--spec/acceptance/ferm_spec.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/config.pp b/manifests/config.pp
index 7dae7a5..16ecd9e 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -49,12 +49,12 @@ class ferm::config {
}
ferm::chain{'FORWARD':
policy => $ferm::forward_policy,
- disable_conntrack => $ferm::disable_conntrack,
+ disable_conntrack => true,
log_dropped_packets => $ferm::forward_log_dropped_packets,
}
ferm::chain{'OUTPUT':
policy => $ferm::output_policy,
- disable_conntrack => $ferm::disable_conntrack,
+ disable_conntrack => true,
log_dropped_packets => $ferm::output_log_dropped_packets,
}
diff --git a/spec/acceptance/ferm_spec.rb b/spec/acceptance/ferm_spec.rb
index c5018da..f827dc2 100644
--- a/spec/acceptance/ferm_spec.rb
+++ b/spec/acceptance/ferm_spec.rb
@@ -32,7 +32,7 @@ basic_manifest = %(
manage_configfile => true,
manage_initfile => #{manage_initfile}, # CentOS-6 does not provide init script
forward_policy => 'DROP',
- output_policy => 'DROP',
+ output_policy => 'ACCEPT',
input_policy => 'DROP',
rules => {
'allow_acceptance_tests' => {
@@ -66,7 +66,7 @@ describe 'ferm' do
end
describe command('iptables-save') do
- its(:stdout) { is_expected.to match %r{.*filter.*:INPUT DROP.*:FORWARD DROP.*:OUTPUT DROP.*}m }
+ its(:stdout) { is_expected.to match %r{.*filter.*:INPUT DROP.*:FORWARD DROP.*:OUTPUT ACCEPT.*}m }
end
describe iptables do