recommit for updates in build 4

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/921eeddd761dc4c">921eeddd761dc4c</a> Jenkins ConfDroid <i>2018-04-10 11:21:33</i>
+<p>
+<h3>recommit for updates in build 3</h3>
+
+</p>
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/1118729c9640ecb">1118729c9640ecb</a> Arne Teuke <i>2018-04-10 11:20:56</i>
+<p>
+<h3>updates README</h3>
+
+</p>
 <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/62260e329bcf99e">62260e329bcf99e</a> Jenkins ConfDroid <i>2018-04-10 11:06:02</i>
 <p>
 <h3>recommit for updates in build 2</h3>

REPOSTRUCTURE.md

@@ -1 +1,59 @@
+.
+|-- doc
+|   |-- css
+|   |   |-- common.css
+|   |   |-- full_list.css
+|   |   `-- style.css
+|   |-- js
+|   |   |-- app.js
+|   |   |-- full_list.js
+|   |   `-- jquery.js
+|   |-- puppet_classes
+|   |   |-- cd_apache_3A_3Amain_3A_3Aconfig.html
+|   |   |-- cd_apache_3A_3Aparams.html
+|   |   |-- cd_apache_3A_3Aserver_3A_3Adirs.html
+|   |   |-- cd_apache_3A_3Aserver_3A_3Afiles.html
+|   |   |-- cd_apache_3A_3Aserver_3A_3Ainstall.html
+|   |   |-- cd_apache_3A_3Aserver_3A_3Aservice.html
+|   |   |-- cd_apache_3A_3Aserver_3A_3Auser.html
+|   |   `-- cd_apache.html
+|   |-- file.README.html
+|   |-- frames.html
+|   |-- _index.html
+|   |-- index.html
+|   |-- puppet_class_list.html
+|   `-- top-level-namespace.html
+|-- examples
+|   |-- vhost.erb
+|   `-- vhost_ssl.erb
+|-- manifests
+|   |-- main
+|   |   `-- config.pp
+|   |-- monitoring
+|   |   `-- target.pp
+|   |-- server
+|   |   |-- dirs.pp
+|   |   |-- files.pp
+|   |   |-- install.pp
+|   |   |-- service.pp
+|   |   `-- user.pp
+|   |-- init.pp
+|   `-- params.pp
+|-- templates
+|   |-- autoindex_conf.erb
+|   |-- httpd_conf.erb
+|   |-- magic.erb
+|   |-- ssl_conf.erb
+|   |-- userdir_conf.erb
+|   `-- welcome.conf
+|-- tests
+|   `-- UTF_Files
+|-- CHANGELOG.md
+|-- Gemfile
+|-- Gemfile.lock
+|-- Jenkinsfile
+|-- LICENSE
+|-- README.md
+`-- REPOSTRUCTURE.md
 
+11 directories, 45 files

doc/_index.html

@@ -78,6 +78,11 @@
       
             </li>
     
+            <li>
+      <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>
+      
+            </li>
+    
             <li>
       <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>
       

doc/file.README.html

@@ -61,7 +61,7 @@
 <p>|Repo Name| version | Build
 Status|
 |---|---|---|---|
-|<code>cd_apache</code>| 0.0.1.7 | <a
+|<code>cd_apache</code>| 0.0.1.8 | <a
 href="https://pipelines.confdroid.com/buildStatus/icon?job=cd_apache">{Build
 Status</a>/]|</p>
 
@@ -133,10 +133,12 @@ structure (optional)
  * file
 system permissions
  * selinux context
-* manage firewall settings (optional)</p>
+* manage firewall settings
-
+(optional)
-<p>Maintenance
+* manage nagios monitoring (optional)
-* manage the service</p>
+Maintenance
+* manage the
+service</p>
 
 <h4 id="label-vHosts">vHosts</h4>
 

doc/index.html

@@ -61,7 +61,7 @@
 <p>|Repo Name| version | Build
 Status|
 |---|---|---|---|
-|<code>cd_apache</code>| 0.0.1.7 | <a
+|<code>cd_apache</code>| 0.0.1.8 | <a
 href="https://pipelines.confdroid.com/buildStatus/icon?job=cd_apache">{Build
 Status</a>/]|</p>
 
@@ -133,10 +133,12 @@ structure (optional)
  * file
 system permissions
  * selinux context
-* manage firewall settings (optional)</p>
+* manage firewall settings
-
+(optional)
-<p>Maintenance
+* manage nagios monitoring (optional)
-* manage the service</p>
+Maintenance
+* manage the
+service</p>
 
 <h4 id="label-vHosts">vHosts</h4>
 

doc/puppet_class_list.html

@@ -50,42 +50,49 @@
     </li>
     
 
-    <li id="object_puppet_classes::cd_apache::params" class="odd">
+    <li id="object_puppet_classes::cd_apache::monitoring::target" class="odd">
+      <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">
       <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="even">
+    <li id="object_puppet_classes::cd_apache::server::dirs" class="odd">
       <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="odd">
+    <li id="object_puppet_classes::cd_apache::server::files" class="even">
       <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="even">
+    <li id="object_puppet_classes::cd_apache::server::install" class="odd">
       <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="odd">
+    <li id="object_puppet_classes::cd_apache::server::service" class="even">
       <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="even">
+    <li id="object_puppet_classes::cd_apache::server::user" class="odd">
       <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>

doc/puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html

@@ -144,7 +144,7 @@ class cd_apache::main::config (
 ) inherits cd_apache::params {
 
   include cd_apache::server::service
-
+  include cd_apache::monitoring::target
 }</pre>
       </td>
     </tr>

doc/puppet_classes/cd_apache_3A_3Amonitoring_3A_3Atarget.html

@@ -0,0 +1,195 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Puppet Class: cd_apache::monitoring::target
+  
+    &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::monitoring::target";
+  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::monitoring::target</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::monitoring::target</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/monitoring/target.pp
+    </dd>
+  </dl>
+</div>
+
+  <h2>Summary</h2>
+  class manages exports for nagios monitoring
+
+<h2>Overview</h2>
+<div class="docstring">
+  <div class="discussion">
+    
+<p>cd_apache::monitoring::target.pp
+Module name: cd_apache
+Author: Arne Teuke
+(arne_teuke@puppetsoft.com)
+License:
+ This file is part of cd_apache.</p>
+
+<p>cd_apache is used for providing automatic configuration of
+ &lt;service /
+purpose&gt;
+ Copyright (C) 2014 PuppetSoft (copyright@puppetsoft.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
+43
+44
+45
+46
+47</pre>
+      </td>
+      <td>
+        <pre class="code"><span class="info file"># File 'manifests/monitoring/target.pp', line 24</span>
+
+class cd_apache::monitoring::target (
+
+) inherits cd_apache::params {
+
+  case $ae_incl_target {
+
+    false: { notify {&#39;Nagios Service target for check_httpd has been disabled via parameters / ENC override&#39;: }
+    }
+    default: {
+      @@nagios_service { &quot;check_http_${::hostname}&quot;:
+        check_command       =&gt; &#39;check_http&#39;,
+        use                 =&gt; &#39;generic-service&#39;,
+        host_name           =&gt; $::fqdn,
+        notification_period =&gt; &#39;24x7&#39;,
+        service_description =&gt; &quot;${::hostname}_check_http&quot;,
+        target              =&gt;  $ae_target_service,
+        owner               =&gt; &#39;nagios&#39;,
+        group               =&gt; &#39;nagios&#39;,
+        mode                =&gt; &#39;6640&#39;,
+        contacts            =&gt; &#39;ops&#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>

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_3Amonitoring_3A_3Atarget.html" title="puppet_classes::cd_apache::monitoring::target (puppet_class)">cd_apache::monitoring::target</a></span><br/>
+      
     </dd>
   </dl>
   
@@ -380,6 +382,37 @@ disabled.</p>
       
     </li>
   
+    <li>
+      
+        <span class='name'>ae_incl_target</span>
+      
+      
+        <span class='type'>(<tt>boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>true</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>whether or not to allow nagios monitoring.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ae_target_service</span>
+      
+      
+        <span class='type'>(<tt>Any</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;/etc/nagios/conf.d/httpd_service.cfg&#39;</tt>)</em>
+      
+      
+    </li>
+  
 </ul>
 
 
@@ -390,7 +423,6 @@ disabled.</p>
         <pre class="lines">
 
 
-58
 59
 60
 61
@@ -451,10 +483,15 @@ disabled.</p>
 116
 117
 118
-119</pre>
+119
+120
+121
+122
+123
+124</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 58</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 59</span>
 
 class cd_apache::params (
 
@@ -474,6 +511,10 @@ $ae_manage_cfg      = false,
 $ae_manage_dirs     = true,
 $ae_allow_user_dirs = false,
 
+# nagios
+$ae_incl_target     = true,
+$ae_target_service  = &#39;/etc/nagios/conf.d/httpd_service.cfg&#39;,
+
 ) {
 
 # installation section

tests/UTF_Files

@@ -4,4 +4,3 @@
 ./.yardoc/objects/root.dat: data
 ./doc/css/style.css: HTML document, UTF-8 Unicode text, with very long lines
 ./doc/js/jquery.js: HTML document, UTF-8 Unicode text, with very long lines
-./REPOSTRUCTURE.md: very short file (no magic)