diff --git a/doc/_index.html b/doc/_index.html index b9c274a..f5b0f9a 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -73,6 +73,11 @@ +
  • + confdroid_ssh::firewall::iptables + +
    • +
  • confdroid_ssh::main::config diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 87e5d2f..5557e96 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -43,49 +43,56 @@
    • -
  • +
  • +
    + confdroid_ssh::firewall::iptables +
    +
    • + + +
  • confdroid_ssh::main::config
    • -
  • +
  • confdroid_ssh::main::dirs
    • -
  • +
  • confdroid_ssh::main::files
    • -
  • +
  • confdroid_ssh::main::install
    • -
  • +
  • confdroid_ssh::main::service
    • -
  • +
  • confdroid_ssh::params
    • -
  • +
  • confdroid_ssh::selinux::semanage
    diff --git a/doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html index 515d544..0f23945 100644 --- a/doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html @@ -113,7 +113,16 @@ 15 16 17 -18 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27 
    # File 'manifests/firewall/iptables.pp', line 6
@@ -121,7 +130,7 @@
 class confdroid_ssh::firewall::iptables (
 
 ) inherits confdroid_ssh::params {
-  if $ssh_use_firewall {
+  if $ssh_use_firewall == true {
     firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}":
       ensure => 'present',
       proto  => 'tcp',
@@ -130,6 +139,15 @@ class confdroid_ssh::firewall::iptables (
       jump   => 'accept',
     }
   }
+  else {
+    firewall { "${ssh_fw_order}${ssh_fw_port} remove SSH on port ${ssh_fw_port}":
+      ensure => 'absent',
+      proto  => 'tcp',
+      source => $ssh_source_range,
+      dport  => $ssh_fw_port,
+      jump   => 'accept',
+    }
+  }
 }
    diff --git a/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html b/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html index 501f091..d7b6f9c 100644 --- a/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html @@ -79,6 +79,8 @@ confdroid_ssh::selinux::semanage
    + confdroid_ssh::firewall::iptables
    + diff --git a/manifests/firewall/iptables.pp b/manifests/firewall/iptables.pp index 400b418..665441d 100644 --- a/manifests/firewall/iptables.pp +++ b/manifests/firewall/iptables.pp @@ -14,6 +14,7 @@ class confdroid_ssh::firewall::iptables ( dport => $ssh_fw_port, jump => 'accept', } + } else { firewall { "${ssh_fw_order}${ssh_fw_port} remove SSH on port ${ssh_fw_port}": ensure => 'absent', @@ -21,7 +22,7 @@ class confdroid_ssh::firewall::iptables ( source => $ssh_source_range, dport => $ssh_fw_port, jump => 'accept', - } } } } +