recommit for updates in build 7

2018-04-20 11:36:16 +02:00
parent e4b622d624
commit a23a3bc4c1
6 changed files with 305 additions and 15 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/3e4c6a15e5f8440">3e4c6a15e5f8440</a> Jenkins ConfDroid <i>2018-04-20 08:32:51</i>
+<p>
+<h3>recommit for updates in build 5</h3>
+
+</p>
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/1c46f1634da0b5a">1c46f1634da0b5a</a> Arne Teuke <i>2018-04-20 08:32:45</i>
+<p>
+<h3>adds empty index.html</h3>
+
+</p>
 <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/0ea5a3a76907b09">0ea5a3a76907b09</a> Jenkins ConfDroid <i>2018-04-20 08:06:28</i>
 <p>
 <h3>recommit for updates in build 4</h3>
--- 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
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -73,6 +73,11 @@
      
            </li>
    
+            <li>
+      <span class='object_link'><a href="puppet_classes/cd_apache_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::cd_apache::firewall::iptables (puppet_class)">cd_apache::firewall::iptables</a></span>
+      
+            </li>
+    
            <li>
      <span class='object_link'><a href="puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::cd_apache::main::config (puppet_class)">cd_apache::main::config</a></span>
      
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -43,56 +43,63 @@
    </li>
    

-    <li id="object_puppet_classes::cd_apache::main::config" class="even">
+    <li id="object_puppet_classes::cd_apache::firewall::iptables" class="even">
+      <div class="item">
+        <span class='object_link'><a href="puppet_classes/cd_apache_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::cd_apache::firewall::iptables (puppet_class)">cd_apache::firewall::iptables</a></span>
+      </div>
+    </li>
+    
+
+    <li id="object_puppet_classes::cd_apache::main::config" class="odd">
      <div class="item">
        <span class='object_link'><a href="puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::cd_apache::main::config (puppet_class)">cd_apache::main::config</a></span>
      </div>
    </li>
    

-    <li id="object_puppet_classes::cd_apache::monitoring::target" class="odd">
+    <li id="object_puppet_classes::cd_apache::monitoring::target" class="even">
      <div class="item">
        <span class='object_link'><a href="puppet_classes/cd_apache_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::cd_apache::monitoring::target (puppet_class)">cd_apache::monitoring::target</a></span>
      </div>
    </li>
    

-    <li id="object_puppet_classes::cd_apache::params" class="even">
+    <li id="object_puppet_classes::cd_apache::params" class="odd">
      <div class="item">
        <span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aparams.html" title="puppet_classes::cd_apache::params (puppet_class)">cd_apache::params</a></span>
      </div>
    </li>
    

-    <li id="object_puppet_classes::cd_apache::server::dirs" class="odd">
+    <li id="object_puppet_classes::cd_apache::server::dirs" class="even">
      <div class="item">
        <span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html" title="puppet_classes::cd_apache::server::dirs (puppet_class)">cd_apache::server::dirs</a></span>
      </div>
    </li>
    

-    <li id="object_puppet_classes::cd_apache::server::files" class="even">
+    <li id="object_puppet_classes::cd_apache::server::files" class="odd">
      <div class="item">
        <span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html" title="puppet_classes::cd_apache::server::files (puppet_class)">cd_apache::server::files</a></span>
      </div>
    </li>
    

-    <li id="object_puppet_classes::cd_apache::server::install" class="odd">
+    <li id="object_puppet_classes::cd_apache::server::install" class="even">
      <div class="item">
        <span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html" title="puppet_classes::cd_apache::server::install (puppet_class)">cd_apache::server::install</a></span>
      </div>
    </li>
    

-    <li id="object_puppet_classes::cd_apache::server::service" class="even">
+    <li id="object_puppet_classes::cd_apache::server::service" class="odd">
      <div class="item">
        <span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::cd_apache::server::service (puppet_class)">cd_apache::server::service</a></span>
      </div>
    </li>
    

-    <li id="object_puppet_classes::cd_apache::server::user" class="odd">
+    <li id="object_puppet_classes::cd_apache::server::user" class="even">
      <div class="item">
        <span class='object_link'><a href="puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html" title="puppet_classes::cd_apache::server::user (puppet_class)">cd_apache::server::user</a></span>
      </div>
--- a/doc/puppet_classes/cd_apache_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_apache_3A_3Afirewall_3A_3Aiptables.html
@@ -0,0 +1,185 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Puppet Class: cd_apache::firewall::iptables
+  
+    &mdash; Documentation by YARD 0.9.12
+  
+</title>
+
+  <link rel="stylesheet" href="../css/style.css" type="text/css" charset="utf-8" />
+
+  <link rel="stylesheet" href="../css/common.css" type="text/css" charset="utf-8" />
+
+<script type="text/javascript" charset="utf-8">
+  pathId = "puppet_classes::cd_apache::firewall::iptables";
+  relpath = '../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../puppet_class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../_index.html">Index (c)</a> &raquo;
+    <span class='title'><span class='object_link'>Puppet Classes</span></span>
+     &raquo; 
+    <span class="title">cd_apache::firewall::iptables</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="puppet_class_list_link"
+        href="../puppet_class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Puppet Class: cd_apache::firewall::iptables</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd><span class='object_link'><a href="cd_apache_3A_3Aparams.html" title="puppet_classes::cd_apache::params (puppet_class)">cd_apache::params</a></span></dd>
+  </dl>
+  
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>
+      manifests/firewall/iptables.pp
+    </dd>
+  </dl>
+</div>
+
+  <h2>Summary</h2>
+  manage firewall settings through cd_firewall or puppetlabs-firewall
+
+<h2>Overview</h2>
+<div class="docstring">
+  <div class="discussion">
+    
+<p>cd_apache::firewall::iptables.pp
+Module name: cd_apache
+Author: Arne Teuke
+(arne_teuke@ConfDroid.com)
+License:
+ This file is part of cd_apache.</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>You should have received a copy of the GNU General Public License
+ along
+with this program. If not, see <a
+href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
+
+  </div>
+</div>
+<div class="tags">
+  
+
+</div><div class="method_details_list">
+  <table class="source_code">
+    <tr>
+      <td>
+        <pre class="lines">
+
+
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42</pre>
+      </td>
+      <td>
+        <pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 24</span>
+
+class cd_apache::firewall::iptables (
+
+) inherits cd_apache::params {
+
+  if $ae_manage_fw == true {
+
+    firewall { &quot;${ae_order_no}${ae_http_port} tcp http port ${ae_http_port}&quot;:
+      proto   =&gt; [&#39;tcp&#39;,&#39;udp&#39;],
+      dport   =&gt; $ae_http_port,
+      action  =&gt; &#39;accept&#39;,
+    }
+
+    firewall { &quot;${ae_order_no}${ae_https_port} tcp http port ${ae_https_port}&quot;:
+      proto   =&gt; [&#39;tcp&#39;,&#39;udp&#39;],
+      dport   =&gt; $ae_https_port,
+      action  =&gt; &#39;accept&#39;,
+    }
+  }
+}</pre>
+      </td>
+    </tr>
+  </table>
+</div>
+</div>
+
+      <div id="footer">
+     Generated by <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
+</div>
+
+    </div>
+  </body>
+</html>
--- a/doc/puppet_classes/cd_apache_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aparams.html
@@ -79,6 +79,8 @@
      
      <span class='object_link'><a href="cd_apache_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::cd_apache::server::service (puppet_class)">cd_apache::server::service</a></span><br/>
      
+      <span class='object_link'><a href="cd_apache_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::cd_apache::firewall::iptables (puppet_class)">cd_apache::firewall::iptables</a></span><br/>
+      
      <span class='object_link'><a href="cd_apache_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::cd_apache::monitoring::target (puppet_class)">cd_apache::monitoring::target</a></span><br/>
      
    </dd>
@@ -400,6 +402,60 @@ disabled.</p>
      
    </li>
  
+    <li>
+      
+        <span class='name'>ae_order_no</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;50&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the order number for the firewall rules</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ae_http_port</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;80&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the port to use for the http protocol</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ae_https_port</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;443&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the port to use for the https protocol</p>
+</div>
+      
+    </li>
+  
    <li>
      
        <span class='name'>ae_target_service</span>
@@ -413,6 +469,19 @@ disabled.</p>
      
    </li>
  
+    <li>
+      
+        <span class='name'>ae_manage_fw</span>
+      
+      
+        <span class='type'>(<tt>Any</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>true</tt>)</em>
+      
+      
+    </li>
+  
 </ul>


@@ -423,10 +492,6 @@ disabled.</p>
        <pre class="lines">


-59
-60
-61
-62
 63
 64
 65
@@ -490,10 +555,20 @@ disabled.</p>
 123
 124
 125
-126</pre>
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136</pre>
      </td>
      <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 59</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 63</span>

 class cd_apache::params (

@@ -517,6 +592,12 @@ $ae_allow_user_dirs = false,
 $ae_incl_target     = true,
 $ae_target_service  = &#39;/etc/nagios/conf.d/httpd_service.cfg&#39;,

+# firewall
+$ae_manage_fw       = true,
+$ae_order_no        = &#39;50&#39;,
+$ae_http_port       = &#39;80&#39;,
+$ae_https_port      = &#39;443&#39;,
+
 ) {

 # installation section