From a2dc5b517570ffbeb5146cc4af3d7dba4942185c Mon Sep 17 00:00:00 2001
From: Arne Teuke <arne_teuke@confdroid.com>
Date: Thu, 19 Dec 2024 10:54:52 +0100
Subject: [PATCH] action to jump

---
 Jenkinsfile                    |  4 ++--
 manifests/firewall/iptables.pp | 18 +++---------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b33ce9e..7e45a2a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -80,7 +80,7 @@ pipeline {
           '''
         }
       }
-
+/*
       stage('SonarScan') { 
          steps {
              sh '''
@@ -92,7 +92,7 @@ pipeline {
               '''
              }
           }
-
+*/
       stage('create Puppet documention') {
         steps {
           sh '/opt/puppetlabs/bin/puppet strings'
diff --git a/manifests/firewall/iptables.pp b/manifests/firewall/iptables.pp
index 3a3a26a..a5a85ad 100644
--- a/manifests/firewall/iptables.pp
+++ b/manifests/firewall/iptables.pp
@@ -29,27 +29,15 @@ class cd_nagios::firewall::iptables (
 
     if $ng_use_https != true {
 
-      firewall { "${ng_fw_order}${ng_http_port} port ${ng_http_port}":
-        proto   => ['tcp','udp'],
-        dport   => $ng_http_port,
-        action  => 'accept',
-      }
-    }
+      include confdroid_infrastructure::firewall::http
 
     if $ng_use_https == true {
 
-      firewall { "${ng_fw_order}${ng_https_port} port ${ng_https_port}":
-        proto   => ['tcp','udp'],
-        dport   => $ng_https_port,
-        action  => 'accept',
-      }
+      include confdroid_infrastructure::firewall::https
 
       if $ng_http_https_fw == true {
 
-        firewall { "${ng_fw_order}${ng_http_port} port ${ng_http_port}":
-          proto   => ['tcp','udp'],
-          dport   => $ng_http_port,
-          action  => 'accept',
+        include confdroid_infrastructure::firewall::http
         }
       }
     }