From 406a049bcef19c7cd51129a5094cb87d38c6d9a3 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Tue, 10 Apr 2018 12:56:53 +0200 Subject: [PATCH 1/8] recommit for updates in build 1 --- CHANGELOG.md | 148 +++++++++++------- REPOSTRUCTURE.md | 56 ------- doc/_index.html | 8 +- doc/css/style.css | 7 + doc/file.README.html | 6 +- doc/frames.html | 2 +- doc/index.html | 6 +- doc/puppet_classes/cd_apache.html | 6 +- .../cd_apache_3A_3Amain_3A_3Aconfig.html | 6 +- doc/puppet_classes/cd_apache_3A_3Aparams.html | 6 +- .../cd_apache_3A_3Aserver_3A_3Adirs.html | 6 +- .../cd_apache_3A_3Aserver_3A_3Afiles.html | 6 +- .../cd_apache_3A_3Aserver_3A_3Ainstall.html | 6 +- .../cd_apache_3A_3Aserver_3A_3Aservice.html | 6 +- .../cd_apache_3A_3Aserver_3A_3Auser.html | 6 +- doc/top-level-namespace.html | 6 +- tests/UTF_Files | 1 + 17 files changed, 123 insertions(+), 165 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1640d00..a148635 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,32 +8,62 @@ Changelog of Git Changelog.

No issue

-5556fd1ec6fdd8d Jenkins Server 2017-07-11 17:12:52 +692569d70082d85 Jenkins Server 2017-07-11 17:27:24 +

+

recommit for updates in build 20

+ +

+5556fd1ec6fdd8d Jenkins Server 2017-07-11 17:12:52

recommit for updates in build 17

-08da1c5e7004f15 Arne Teuke 2017-07-11 17:12:23 -

-

finalised this stage

- -

-c1963582f006a9d Jenkins Server 2017-07-11 17:08:47 +c1963582f006a9d Jenkins Server 2017-07-11 17:08:47

recommit for updates in build 16

-19a1a86f2a3907b Arne Teuke 2017-07-11 17:06:45 -

-

finalised this stage

- -

-f1988c6272ba4a6 Jenkins Server 2017-07-11 17:01:52 +f1988c6272ba4a6 Jenkins Server 2017-07-11 17:01:52

recommit for updates in build 14

-834532297866d17 Arne Teuke 2017-07-11 17:01:19 + +

v0.0.1.7

+

No issue

+ + +4296733d3e34a37 Arne Teuke 2017-07-11 17:26:50 +

+

more improved testing

+ +

+387ab193a95da9e Arne Teuke 2017-07-11 17:24:39 +

+

more improved testing

+ +

+ +

v0.0.1.6

+

No issue

+ + +eacdc6522bc654c Arne Teuke 2017-07-11 17:14:21 +

+

updated README

+ +

+08da1c5e7004f15 Arne Teuke 2017-07-11 17:12:23 +

+

finalised this stage

+ +

+19a1a86f2a3907b Arne Teuke 2017-07-11 17:06:45 +

+

finalised this stage

+ +

+834532297866d17 Arne Teuke 2017-07-11 17:01:19

added one more step

@@ -43,62 +73,62 @@ Changelog of Git Changelog.

No issue

-114dd0f0b58ec6a Arne Teuke 2017-07-11 16:57:22 +114dd0f0b58ec6a Arne Teuke 2017-07-11 16:57:22

removed stale FileList

-7ba28eca8e1bd88 Arne Teuke 2017-07-11 16:56:04 +7ba28eca8e1bd88 Arne Teuke 2017-07-11 16:56:04

updated README and version

-3764f0bef1450d2 Jenkins Server 2017-07-11 16:53:37 +3764f0bef1450d2 Jenkins Server 2017-07-11 16:53:37

recommit for updates in build 12

-c9a26ad0546881e Arne Teuke 2017-07-11 16:53:03 +c9a26ad0546881e Arne Teuke 2017-07-11 16:53:03

enhanced test to keep a permanent list of UTF files in tests/UTF_Files

-a1b2032baaaf745 Jenkins Server 2017-07-11 16:32:16 +a1b2032baaaf745 Jenkins Server 2017-07-11 16:32:16

recommit for updates in build 11

-c380f8f9960fa1a Jenkins Server 2017-07-10 18:00:02 +c380f8f9960fa1a Jenkins Server 2017-07-10 18:00:02

recommit for updates in build 10

-ed5ca1113ea3170 Jenkins Server 2017-07-09 15:24:08 +ed5ca1113ea3170 Jenkins Server 2017-07-09 15:24:08

recommit for updates in build 9

-36dc5918e52df38 Jenkins Server 2017-07-07 16:41:30 +36dc5918e52df38 Jenkins Server 2017-07-07 16:41:30

recommit for updates in build 4

-3715b3a582a1a5a Arne Teuke 2017-07-07 16:40:31 +3715b3a582a1a5a Arne Teuke 2017-07-07 16:40:31

updated README

-871d6e65baf4ec4 Jenkins Server 2017-07-07 16:38:35 +871d6e65baf4ec4 Jenkins Server 2017-07-07 16:38:35

recommit for updates in build 3

-a88ed09f423fbb7 Arne Teuke 2017-07-07 16:38:00 +a88ed09f423fbb7 Arne Teuke 2017-07-07 16:38:00

updated README

-e13154f0117c337 Jenkins Server 2017-07-07 15:22:20 +e13154f0117c337 Jenkins Server 2017-07-07 15:22:20

recommit for updates in build 2

@@ -108,12 +138,12 @@ Changelog of Git Changelog.

No issue

-9b646162ae4c877 Arne Teuke 2017-07-11 16:31:45 +9b646162ae4c877 Arne Teuke 2017-07-11 16:31:45

added new Jenkins test to check for unwanted UTF8 files

-df0edc483d0918b Arne Teuke 2017-07-10 17:59:32 +df0edc483d0918b Arne Teuke 2017-07-10 17:59:32

converted LICENSE to ASCII

@@ -123,22 +153,22 @@ Changelog of Git Changelog.

No issue

-ed7589fbfab9f48 Arne Teuke 2017-07-09 15:23:38 +ed7589fbfab9f48 Arne Teuke 2017-07-09 15:23:38

removed sites and simply added the examples

-fefd3a57ab1309e Arne Teuke 2017-07-09 15:22:04 +fefd3a57ab1309e Arne Teuke 2017-07-09 15:22:04

removed sites and simply added the examples

-0768054b488d129 Arne Teuke 2017-07-09 15:20:05 +0768054b488d129 Arne Teuke 2017-07-09 15:20:05

added vhost examples

-7ac9b407305f98f Arne Teuke 2017-07-09 15:18:26 +7ac9b407305f98f Arne Teuke 2017-07-09 15:18:26

added vhost examples

@@ -148,12 +178,12 @@ Changelog of Git Changelog.

No issue

-ef4e41395b0e8af Arne Teuke 2017-07-09 15:15:32 +ef4e41395b0e8af Arne Teuke 2017-07-09 15:15:32

updated README with vhost details and updated version

-ce399480a464f9e Arne Teuke 2017-07-09 15:08:26 +ce399480a464f9e Arne Teuke 2017-07-09 15:08:26

updated README

@@ -163,27 +193,27 @@ Changelog of Git Changelog.

No issue

-898cbe17468d9f0 Arne Teuke 2017-07-07 15:21:28 +898cbe17468d9f0 Arne Teuke 2017-07-07 15:21:28

updated README

-ff758351baaf2af Jenkins Server 2017-07-07 15:18:31 +ff758351baaf2af Jenkins Server 2017-07-07 15:18:31

recommit for updates in build 1

-f434a67d79dd236 Arne Teuke 2017-07-07 15:17:42 +f434a67d79dd236 Arne Teuke 2017-07-07 15:17:42

updated README and version

-44a6e4aa082511c Arne Teuke 2017-07-07 15:15:43 +44a6e4aa082511c Arne Teuke 2017-07-07 15:15:43

added Puppet documentation, Jenkinsfile and Gemfile for CI

-08e4559e677e0e7 Arne Teuke 2017-06-20 10:25:53 +08e4559e677e0e7 Arne Teuke 2017-06-20 10:25:53

updated README

@@ -193,102 +223,102 @@ Changelog of Git Changelog.

No issue

-c223872b293c10a Arne Teuke 2017-06-20 09:24:58 +c223872b293c10a Arne Teuke 2017-06-20 09:24:58

finished initial release

-b2ad14d45611d8b Arne Teuke 2017-06-20 09:18:30 +b2ad14d45611d8b Arne Teuke 2017-06-20 09:18:30

added all file controls

-b0b9a0a692fba2d Arne Teuke 2017-06-19 16:06:52 +b0b9a0a692fba2d Arne Teuke 2017-06-19 16:06:52

started adding files

-9b09518580e22b4 Arne Teuke 2017-06-19 15:24:25 +9b09518580e22b4 Arne Teuke 2017-06-19 15:24:25

finished directories

-84fc5905c149f2b Arne Teuke 2017-06-19 15:18:29 +84fc5905c149f2b Arne Teuke 2017-06-19 15:18:29

changed user home

-fb976134a14040f Arne Teuke 2017-06-19 15:12:54 +fb976134a14040f Arne Teuke 2017-06-19 15:12:54

changed group

-c64c46b8962ea2c Arne Teuke 2017-06-19 15:10:56 +c64c46b8962ea2c Arne Teuke 2017-06-19 15:10:56

added more dirs

-21dbe645b54d37d Arne Teuke 2017-06-19 15:07:36 +21dbe645b54d37d Arne Teuke 2017-06-19 15:07:36

added more dirs

-e4d82e708ff6138 Arne Teuke 2017-06-19 15:00:02 +e4d82e708ff6138 Arne Teuke 2017-06-19 15:00:02

added more dirs

-bbcb22214b0543e Arne Teuke 2017-06-19 14:55:05 +bbcb22214b0543e Arne Teuke 2017-06-19 14:55:05

added more dirs

-1716f1654b94fda Arne Teuke 2017-06-19 14:47:05 +1716f1654b94fda Arne Teuke 2017-06-19 14:47:05

fixed target

-f544863d4dc69c5 Arne Teuke 2017-06-19 14:41:36 +f544863d4dc69c5 Arne Teuke 2017-06-19 14:41:36

added some directory control, testing

-7db89790839718b Arne Teuke 2017-06-19 14:40:58 +7db89790839718b Arne Teuke 2017-06-19 14:40:58

added some directory control, testing

-c5be228aa7a091f Arne Teuke 2017-06-19 14:38:44 +c5be228aa7a091f Arne Teuke 2017-06-19 14:38:44

added some directory control, testing

-a441326bf8ef9e1 Arne Teuke 2017-06-19 14:35:06 +a441326bf8ef9e1 Arne Teuke 2017-06-19 14:35:06

added some directory control, testing

-9f79e6b25b36463 Arne Teuke 2017-06-19 14:33:27 +9f79e6b25b36463 Arne Teuke 2017-06-19 14:33:27

added some directory control, testing

-83b33bf7f5eccbd Arne Teuke 2017-06-19 13:50:10 +83b33bf7f5eccbd Arne Teuke 2017-06-19 13:50:10

added user management

-67f81f9795d48ae Arne Teuke 2017-06-19 13:45:41 +67f81f9795d48ae Arne Teuke 2017-06-19 13:45:41

changed package selection

-972c9a059f08212 Arne Teuke 2017-06-19 13:42:52 +972c9a059f08212 Arne Teuke 2017-06-19 13:42:52

changed package selection

-1bd7fe8230f98cf Arne Teuke 2017-06-19 13:32:14 +1bd7fe8230f98cf Arne Teuke 2017-06-19 13:32:14

added service control

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index e18195c..8b13789 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -1,57 +1 @@ -. -|-- 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 -| |-- 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 -10 directories, 44 files diff --git a/doc/_index.html b/doc/_index.html index 4157de1..ec4fe69 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -4,7 +4,7 @@ - Documentation by YARD 0.9.9 + Documentation by YARD 0.9.12 @@ -52,7 +52,7 @@
-

Documentation by YARD 0.9.9

+

Documentation by YARD 0.9.12

Alphabetic Index

@@ -137,9 +137,7 @@
diff --git a/doc/css/style.css b/doc/css/style.css index f682a69..57e8f9d 100644 --- a/doc/css/style.css +++ b/doc/css/style.css @@ -484,6 +484,13 @@ pre.code .rubyid_backref, pre.code .rubyid_nth_ref { color: #6D79DE; } pre.code .regexp, .dregexp { color: #036A07; } pre.code a { border-bottom: 1px dotted #bbf; } +/* inline code */ +p > code { + padding: 1px 3px 1px 3px; + border: 1px solid #E1E1E8; + background: #F7F7F9; + border-radius: 4px; +} /* Color fix for links */ #content .summary_desc pre.code .id > .object_link a, /* identifier */ diff --git a/doc/file.README.html b/doc/file.README.html index 95d7256..88e5f05 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -6,7 +6,7 @@ File: README - — Documentation by YARD 0.9.9 + — Documentation by YARD 0.9.12 @@ -279,9 +279,7 @@ environments.

diff --git a/doc/frames.html b/doc/frames.html index 0cb1371..42ca6b6 100644 --- a/doc/frames.html +++ b/doc/frames.html @@ -2,7 +2,7 @@ - Documentation by YARD 0.9.9 + Documentation by YARD 0.9.12 + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: cd_apache::monitoring::target

+
+ +
+
Inherits:
+
cd_apache::params
+
+ + +
+
Defined in:
+
+ manifests/monitoring/target.pp +
+
+
+ +

Summary

+ class manages exports for nagios monitoring + +

Overview

+
+
+ +

cd_apache::monitoring::target.pp +Module name: cd_apache +Author: Arne Teuke +(arne_teuke@puppetsoft.com) +License: + This file is part of cd_apache.

+ +

cd_apache is used for providing automatic configuration of + <service / +purpose> + 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.

+ +

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
+43
+44
+45
+46
+47
+ 		+ 
# File 'manifests/monitoring/target.pp', line 24
+
+class cd_apache::monitoring::target (
+
+) inherits cd_apache::params {
+
+  case $ae_incl_target {
+
+    false: { notify {'Nagios Service target for check_httpd has been disabled via parameters / ENC override': }
+    }
+    default: {
+      @@nagios_service { "check_http_${::hostname}":
+        check_command       => 'check_http',
+        use                 => 'generic-service',
+        host_name           => $::fqdn,
+        notification_period => '24x7',
+        service_description => "${::hostname}_check_http",
+        target              =>  $ae_target_service,
+        owner               => 'nagios',
+        group               => 'nagios',
+        mode                => '6640',
+        contacts            => 'ops',
+      }
+    }
+  }
+}
+
+
+
+ + + +
+ + \ 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 bae4277..0db5a45 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::monitoring::target
+ @@ -380,6 +382,37 @@ disabled.

+
  • + + ae_incl_target + + + (boolean) + + + (defaults to: true) + + + — +
    +

    whether or not to allow nagios monitoring.

    +
    + +
    • + +
  • + + ae_target_service + + + (Any) + + + (defaults to: '/etc/nagios/conf.d/httpd_service.cfg') + + +
    • + @@ -390,7 +423,6 @@ disabled.

     
 
-58
 59
 60
 61
@@ -451,10 +483,15 @@ disabled.
    
 116
 117
 118
-119
    +119 +120 +121 +122 +123 +124 - 
    # File 'manifests/params.pp', line 58
+        
    # File 'manifests/params.pp', line 59
 
 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  = '/etc/nagios/conf.d/httpd_service.cfg',
+
 ) {
 
 # installation section
diff --git a/tests/UTF_Files b/tests/UTF_Files
index 066e577..a138597 100644
--- a/tests/UTF_Files
+++ b/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)

From 3e4c6a15e5f84400e385ae22e6e0093ade0fee80 Mon Sep 17 00:00:00 2001
From: Jenkins ConfDroid 
Date: Fri, 20 Apr 2018 10:32:51 +0200
Subject: [PATCH 5/8] recommit for updates in build 5

---
 CHANGELOG.md                                  | 131 ++++++++++--------
 REPOSTRUCTURE.md                              |   4 +-
 doc/puppet_classes/cd_apache_3A_3Aparams.html |   6 +-
 .../cd_apache_3A_3Aserver_3A_3Afiles.html     |  36 ++++-
 tests/UTF_Files                               |   1 +
 5 files changed, 117 insertions(+), 61 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48001be..9a4c43c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,29 +8,44 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+0ea5a3a76907b09 Jenkins ConfDroid 2018-04-20 08:06:28
+
    
+
    recommit for updates in build 4
    
+
+
    
 921eeddd761dc4c Jenkins ConfDroid 2018-04-10 11:21:33
 
    
 
    recommit for updates in build 3
    
 
-
    
-1118729c9640ecb Arne Teuke 2018-04-10 11:20:56
-
    
-
    updates README
    
-
 
    
 62260e329bcf99e Jenkins ConfDroid 2018-04-10 11:06:02
 
    
 
    recommit for updates in build 2
    
 
 
    
-84ca8d72b971661 Arne Teuke 2018-04-10 11:05:24
+406a049bcef19c7 Jenkins ConfDroid 2018-04-10 10:56:53
+
    
+
    recommit for updates in build 1
    
+
+
    
+
+
     0.0.1.8 
    
+
     No issue 
    
+
+
+e68298bc5c126fc Arne Teuke 2018-04-20 08:06:12
+
    
+
    adds nagios target
    
+
+
    
+1118729c9640ecb Arne Teuke 2018-04-10 11:20:56
 
    
 
    updates README
    
 
 
    
-406a049bcef19c7 Jenkins ConfDroid 2018-04-10 10:56:53
+84ca8d72b971661 Arne Teuke 2018-04-10 11:05:24
 
    
-
    recommit for updates in build 1
    
+
    updates README
    
 
 
    
 5009ae57d917323 Arne Teuke 2018-04-10 10:56:10
@@ -57,61 +72,11 @@ Changelog of Git Changelog.
 
    
 
    recommit for updates in build 14
    
 
-
    
-
-
     v0.0.1.7 
    
-
     No issue 
    
-
-
-4296733d3e34a37 Arne Teuke 2017-07-11 17:26:50
-
    
-
    more improved testing
    
-
-
    
-387ab193a95da9e Arne Teuke 2017-07-11 17:24:39
-
    
-
    more improved testing
    
-
-
    
-
-
     v0.0.1.6 
    
-
     No issue 
    
-
-
-eacdc6522bc654c Arne Teuke 2017-07-11 17:14:21
-
    
-
    updated README
    
-
-
    
-08da1c5e7004f15 Arne Teuke 2017-07-11 17:12:23
-
    
-
    finalised this stage
    
-
-
    
-19a1a86f2a3907b Arne Teuke 2017-07-11 17:06:45
-
    
-
    finalised this stage
    
-
 
    
 834532297866d17 Arne Teuke 2017-07-11 17:01:19
 
    
 
    added one more step
    
 
-
    
-
-
     v0.0.1.4 
    
-
     No issue 
    
-
-
-114dd0f0b58ec6a Arne Teuke 2017-07-11 16:57:22
-
    
-
    removed stale FileList
    
-
-
    
-7ba28eca8e1bd88 Arne Teuke 2017-07-11 16:56:04
-
    
-
    updated README and version
    
-
 
    
 3764f0bef1450d2 Jenkins Server 2017-07-11 16:53:37
 
    
@@ -164,6 +129,56 @@ Changelog of Git Changelog.
 
 
    
 
+
     v0.0.1.7 
    
+
     No issue 
    
+
+
+4296733d3e34a37 Arne Teuke 2017-07-11 17:26:50
+
    
+
    more improved testing
    
+
+
    
+387ab193a95da9e Arne Teuke 2017-07-11 17:24:39
+
    
+
    more improved testing
    
+
+
    
+
+
     v0.0.1.6 
    
+
     No issue 
    
+
+
+eacdc6522bc654c Arne Teuke 2017-07-11 17:14:21
+
    
+
    updated README
    
+
+
    
+08da1c5e7004f15 Arne Teuke 2017-07-11 17:12:23
+
    
+
    finalised this stage
    
+
+
    
+19a1a86f2a3907b Arne Teuke 2017-07-11 17:06:45
+
    
+
    finalised this stage
    
+
+
    
+
+
     v0.0.1.4 
    
+
     No issue 
    
+
+
+114dd0f0b58ec6a Arne Teuke 2017-07-11 16:57:22
+
    
+
    removed stale FileList
    
+
+
    
+7ba28eca8e1bd88 Arne Teuke 2017-07-11 16:56:04
+
    
+
    updated README and version
    
+
+
    
+
 
     v0.0.1.3 
    
 
     No issue 
    
 
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 09f43e7..70355aa 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -10,6 +10,7 @@
 |   |   `-- jquery.js
 |   |-- puppet_classes
 |   |   |-- cd_apache_3A_3Amain_3A_3Aconfig.html
+|   |   |-- cd_apache_3A_3Amonitoring_3A_3Atarget.html
 |   |   |-- cd_apache_3A_3Aparams.html
 |   |   |-- cd_apache_3A_3Aserver_3A_3Adirs.html
 |   |   |-- cd_apache_3A_3Aserver_3A_3Afiles.html
@@ -42,6 +43,7 @@
 |-- templates
 |   |-- autoindex_conf.erb
 |   |-- httpd_conf.erb
+|   |-- index_html.erb
 |   |-- magic.erb
 |   |-- ssl_conf.erb
 |   |-- userdir_conf.erb
@@ -56,4 +58,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-11 directories, 45 files
+11 directories, 47 files
diff --git a/doc/puppet_classes/cd_apache_3A_3Aparams.html b/doc/puppet_classes/cd_apache_3A_3Aparams.html
index 0db5a45..2e597cd 100644
--- a/doc/puppet_classes/cd_apache_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aparams.html
@@ -488,7 +488,9 @@ disabled.
    
 121
 122
 123
-124
    
+124
+125
+126
    # File 'manifests/params.pp', line 59
@@ -553,6 +555,8 @@ $ae_autoindex_file  = "${ae_conf_d_dir}/autoindex.conf"
 $ae_autoindex_erb   = 'cd_apache/autoindex_conf.erb'
 $ae_userdir_file    = "${ae_conf_d_dir}/userdir.conf"
 $ae_userdir_erb     = 'cd_apache/userdir_conf.erb'
+$ae_index_file      = '/var/www/html/index.html'
+$ae_index_erb       = 'cd_apache/index_html.erb'
 
 # includes must be last
 
diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
index 3999796..b3a1fa6 100644
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
@@ -219,7 +219,24 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 112
 113
 114
-115
    +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 +128 +129 +130 +131 +132 
    # File 'manifests/server/files.pp', line 24
@@ -296,6 +313,23 @@ class cd_apache::server::files (
       notify    =>  Service['httpd'],
   }
 
+    # manage index.html
+
+    file  { $ae_index_file:
+      ensure    =>  file,
+      path      =>  $ae_index_file,
+      owner     =>  $ae_user_name,
+      group     =>  $ae_user_name,
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  httpd_sys_content_t,
+      seluser   =>  system_u,
+      content   =>  template($ae_index_erb),
+      notify    =>  Service['httpd'],
+  }
+
+
     if $ae_allow_user_dirs == true {
 
     # manage userdir.conf
diff --git a/tests/UTF_Files b/tests/UTF_Files
index a138597..3dd8a12 100644
--- a/tests/UTF_Files
+++ b/tests/UTF_Files
@@ -2,5 +2,6 @@
 ./.yardoc/proxy_types: Applesoft BASIC program data
 ./.yardoc/complete: empty
 ./.yardoc/objects/root.dat: data
+./templates/index_html.erb: empty
 ./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

From a23a3bc4c150283c4e70492e245234fed6a7cfca Mon Sep 17 00:00:00 2001
From: Jenkins ConfDroid 
Date: Fri, 20 Apr 2018 11:36:16 +0200
Subject: [PATCH 6/8] 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

From 58e6948571d77fd6141772222e4fd46d006e7dab Mon Sep 17 00:00:00 2001
From: Jenkins ConfDroid 
Date: Fri, 20 Apr 2018 11:41:16 +0200
Subject: [PATCH 7/8] recommit for updates in build 8

---
 CHANGELOG.md                                  | 75 +++++++++++--------
 REPOSTRUCTURE.md                              |  3 +-
 .../cd_apache_3A_3Aserver_3A_3Afiles.html     | 34 ++++-----
 3 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac54736..3f5d3ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+a23a3bc4c150283 Jenkins ConfDroid 2018-04-20 09:36:16
+
    
+
    recommit for updates in build 7
    
+
+
    
+5977dab8c8432e5 Arne Teuke 2018-04-20 09:36:10
+
    
+
    fixes typo
    
+
+
    
+dddb9afc18a15d6 Arne Teuke 2018-04-20 09:30:48
+
    
+
    adds fw rules here to ensure fw is managed on apache lavel instead application level
    
+
+
    
 3e4c6a15e5f8440 Jenkins ConfDroid 2018-04-20 08:32:51
 
    
 
    recommit for updates in build 5
    
@@ -72,11 +87,21 @@ Changelog of Git Changelog.
 
    
 
    recommit for updates in build 17
    
 
+
    
+08da1c5e7004f15 Arne Teuke 2017-07-11 17:12:23
+
    
+
    finalised this stage
    
+
 
    
 c1963582f006a9d Jenkins Server 2017-07-11 17:08:47
 
    
 
    recommit for updates in build 16
    
 
+
    
+19a1a86f2a3907b Arne Teuke 2017-07-11 17:06:45
+
    
+
    finalised this stage
    
+
 
    
 f1988c6272ba4a6 Jenkins Server 2017-07-11 17:01:52
 
    
@@ -137,6 +162,26 @@ Changelog of Git Changelog.
 
    
 
    recommit for updates in build 2
    
 
+
    
+ff758351baaf2af Jenkins Server 2017-07-07 15:18:31
+
    
+
    recommit for updates in build 1
    
+
+
    
+f434a67d79dd236 Arne Teuke 2017-07-07 15:17:42
+
    
+
    updated README and version
    
+
+
    
+44a6e4aa082511c Arne Teuke 2017-07-07 15:15:43
+
    
+
    added Puppet documentation, Jenkinsfile and Gemfile for CI
    
+
+
    
+08e4559e677e0e7 Arne Teuke 2017-06-20 10:25:53
+
    
+
    updated README
    
+
 
    
 
 
     v0.0.1.7 
    
@@ -162,16 +207,6 @@ Changelog of Git Changelog.
 
    
 
    updated README
    
 
-
    
-08da1c5e7004f15 Arne Teuke 2017-07-11 17:12:23
-
    
-
    finalised this stage
    
-
-
    
-19a1a86f2a3907b Arne Teuke 2017-07-11 17:06:45
-
    
-
    finalised this stage
    
-
 
    
 
 
     v0.0.1.4 
    
@@ -252,26 +287,6 @@ Changelog of Git Changelog.
 
    
 
    updated README
    
 
-
    
-ff758351baaf2af Jenkins Server 2017-07-07 15:18:31
-
    
-
    recommit for updates in build 1
    
-
-
    
-f434a67d79dd236 Arne Teuke 2017-07-07 15:17:42
-
    
-
    updated README and version
    
-
-
    
-44a6e4aa082511c Arne Teuke 2017-07-07 15:15:43
-
    
-
    added Puppet documentation, Jenkinsfile and Gemfile for CI
    
-
-
    
-08e4559e677e0e7 Arne Teuke 2017-06-20 10:25:53
-
    
-
    updated README
    
-
 
    
 
 
     v0.0.0.2 
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 05f0f3b..b8c9c33 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -9,6 +9,7 @@
 |   |   |-- full_list.js
 |   |   `-- jquery.js
 |   |-- puppet_classes
+|   |   |-- cd_apache_3A_3Afirewall_3A_3Aiptables.html
 |   |   |-- cd_apache_3A_3Amain_3A_3Aconfig.html
 |   |   |-- cd_apache_3A_3Amonitoring_3A_3Atarget.html
 |   |   |-- cd_apache_3A_3Aparams.html
@@ -60,4 +61,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-12 directories, 48 files
+12 directories, 49 files
diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
index b3a1fa6..3853dbf 100644
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
@@ -313,23 +313,6 @@ class cd_apache::server::files (
       notify    =>  Service['httpd'],
   }
 
-    # manage index.html
-
-    file  { $ae_index_file:
-      ensure    =>  file,
-      path      =>  $ae_index_file,
-      owner     =>  $ae_user_name,
-      group     =>  $ae_user_name,
-      mode      =>  '0644',
-      selrange  =>  s0,
-      selrole   =>  object_r,
-      seltype   =>  httpd_sys_content_t,
-      seluser   =>  system_u,
-      content   =>  template($ae_index_erb),
-      notify    =>  Service['httpd'],
-  }
-
-
     if $ae_allow_user_dirs == true {
 
     # manage userdir.conf
@@ -349,6 +332,23 @@ class cd_apache::server::files (
       }
     }
   }
+
+    # manage index.html
+
+    file  { $ae_index_file:
+      ensure    =>  file,
+      path      =>  $ae_index_file,
+      owner     =>  $ae_user_name,
+      group     =>  $ae_user_name,
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  httpd_sys_content_t,
+      seluser   =>  system_u,
+      content   =>  template($ae_index_erb),
+      notify    =>  Service['httpd'],
+  }
+
 }
    
       
     

From de3bea84c4042da62e660190ccc718d94292f9d4 Mon Sep 17 00:00:00 2001
From: Jenkins ConfDroid 
Date: Fri, 20 Apr 2018 11:50:58 +0200
Subject: [PATCH 8/8] recommit for updates in build 9

---
 CHANGELOG.md                                           | 10 ++++++++++
 .../cd_apache_3A_3Aserver_3A_3Aservice.html            |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f5d3ec..c46d3a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+58e6948571d77fd Jenkins ConfDroid 2018-04-20 09:41:16
+
    
+
    recommit for updates in build 8
    
+
+
    
+2e35b87cc14bccd Arne Teuke 2018-04-20 09:41:13
+
    
+
    fixes typo
    
+
+
    
 a23a3bc4c150283 Jenkins ConfDroid 2018-04-20 09:36:16
 
    
 
    recommit for updates in build 7
    
diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html
index 638b1d4..adca50b 100644
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html
@@ -140,7 +140,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 33
 34
 35
-36
    +36 +37 
    # File 'manifests/server/service.pp', line 24
@@ -150,6 +151,7 @@ class cd_apache::server::service (
 ) inherits cd_apache::params {
 
   require cd_apache::server::files
+  require cd_apache::firewall::iptables
 
   service { $ae_service:
     ensure      => running,