From a23a3bc4c150283c4e70492e245234fed6a7cfca Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Fri, 20 Apr 2018 11:36:16 +0200 Subject: [PATCH] recommit for updates in build 7 --- CHANGELOG.md | 10 + REPOSTRUCTURE.md | 4 +- doc/_index.html | 5 + doc/puppet_class_list.html | 23 ++- ...cd_apache_3A_3Afirewall_3A_3Aiptables.html | 185 ++++++++++++++++++ doc/puppet_classes/cd_apache_3A_3Aparams.html | 93 ++++++++- 6 files changed, 305 insertions(+), 15 deletions(-) create mode 100644 doc/puppet_classes/cd_apache_3A_3Afirewall_3A_3Aiptables.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a4c43c..ac54736 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+3e4c6a15e5f8440 Jenkins ConfDroid 2018-04-20 08:32:51 +

+

recommit for updates in build 5

+ +

+1c46f1634da0b5a Arne Teuke 2018-04-20 08:32:45 +

+

adds empty index.html

+ +

0ea5a3a76907b09 Jenkins ConfDroid 2018-04-20 08:06:28

recommit for updates in build 4

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 70355aa..05f0f3b 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -28,6 +28,8 @@ | |-- vhost.erb | `-- vhost_ssl.erb |-- manifests +| |-- firewall +| | `-- iptables.pp | |-- main | | `-- config.pp | |-- monitoring @@ -58,4 +60,4 @@ |-- README.md `-- REPOSTRUCTURE.md -11 directories, 47 files +12 directories, 48 files diff --git a/doc/_index.html b/doc/_index.html index 280e922..8d9fe22 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -73,6 +73,11 @@ +
  • + cd_apache::firewall::iptables + +
    • +
  • cd_apache::main::config diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 144e4ca..73d951f 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -43,56 +43,63 @@
    • -
  • +
  • +
    + cd_apache::firewall::iptables +
    +
    • + + +
  • cd_apache::main::config
    • -
  • +
  • cd_apache::monitoring::target
    • -
  • +
  • cd_apache::params
    • -
  • +
  • cd_apache::server::dirs
    • -
  • +
  • cd_apache::server::files
    • -
  • +
  • cd_apache::server::install
    • -
  • +
  • cd_apache::server::service
    • -
  • +
  • cd_apache::server::user
    diff --git a/doc/puppet_classes/cd_apache_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_apache_3A_3Afirewall_3A_3Aiptables.html new file mode 100644 index 0000000..8fd5c63 --- /dev/null +++ b/doc/puppet_classes/cd_apache_3A_3Afirewall_3A_3Aiptables.html @@ -0,0 +1,185 @@ + + + + + + + Puppet Class: cd_apache::firewall::iptables + + — Documentation by YARD 0.9.12 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: cd_apache::firewall::iptables

    +
    + +
    +
    Inherits:
    +
    cd_apache::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/firewall/iptables.pp +
    +
    +
    + +

    Summary

    + manage firewall settings through cd_firewall or puppetlabs-firewall + +

    Overview

    +
    +
    + +

    cd_apache::firewall::iptables.pp +Module name: cd_apache +Author: Arne Teuke +(arne_teuke@ConfDroid.com) +License: + This file is part of cd_apache.

    + +

    cd_apache is used for providing automatic configuration of + log analyzer. + +Copyright (C) 2017 ConfDroid (copyright@ConfDroid.com) + This program is +free software: you can redistribute it and/or modify + it under the terms of +the GNU General Public License as published by + the Free Software +Foundation, either version 3 of the License, or + (at your option) any later +version.

    + +

    This program is distributed in the hope that it will be useful, + but +WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License +for more details.

    + +

    You should have received a copy of the GNU General Public License + along +with this program. If not, see www.gnu.org/licenses/.

    + +
    +
    +
    + + +
    + + + + + +
    + 
    +
+
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
    +     		+ 
    # File 'manifests/firewall/iptables.pp', line 24
+
+class cd_apache::firewall::iptables (
+
+) inherits cd_apache::params {
+
+  if $ae_manage_fw == true {
+
+    firewall { "${ae_order_no}${ae_http_port} tcp http port ${ae_http_port}":
+      proto   => ['tcp','udp'],
+      dport   => $ae_http_port,
+      action  => 'accept',
+    }
+
+    firewall { "${ae_order_no}${ae_https_port} tcp http port ${ae_https_port}":
+      proto   => ['tcp','udp'],
+      dport   => $ae_https_port,
+      action  => 'accept',
+    }
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file diff --git a/doc/puppet_classes/cd_apache_3A_3Aparams.html b/doc/puppet_classes/cd_apache_3A_3Aparams.html index 2e597cd..6400889 100644 --- a/doc/puppet_classes/cd_apache_3A_3Aparams.html +++ b/doc/puppet_classes/cd_apache_3A_3Aparams.html @@ -79,6 +79,8 @@ cd_apache::server::service
    + cd_apache::firewall::iptables
    + cd_apache::monitoring::target
    @@ -400,6 +402,60 @@ disabled.

    • +
  • + + ae_order_no + + + (string) + + + (defaults to: '50') + + + — +
    +

    the order number for the firewall rules

    +
    + +
    • + +
  • + + ae_http_port + + + (string) + + + (defaults to: '80') + + + — +
    +

    the port to use for the http protocol

    +
    + +
    • + +
  • + + ae_https_port + + + (string) + + + (defaults to: '443') + + + — +
    +

    the port to use for the https protocol

    +
    + +
    • +
  • ae_target_service @@ -413,6 +469,19 @@ disabled.

    • +
  • + + ae_manage_fw + + + (Any) + + + (defaults to: true) + + +
    • + @@ -423,10 +492,6 @@ disabled.

     
 
-59
-60
-61
-62
 63
 64
 65
@@ -490,10 +555,20 @@ disabled.
    
 123
 124
 125
-126
    +126 +127 +128 +129 +130 +131 +132 +133 +134 +135 +136 - 
    # File 'manifests/params.pp', line 59
+        
    # File 'manifests/params.pp', line 63
 
 class cd_apache::params (
 
@@ -517,6 +592,12 @@ $ae_allow_user_dirs = false,
 $ae_incl_target     = true,
 $ae_target_service  = '/etc/nagios/conf.d/httpd_service.cfg',
 
+# firewall
+$ae_manage_fw       = true,
+$ae_order_no        = '50',
+$ae_http_port       = '80',
+$ae_https_port      = '443',
+
 ) {
 
 # installation section