From 3a3e3ceef9a4a2f7051c17c29bd7e968cb4c564c Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 20 Jul 2017 15:47:46 +0200 Subject: [PATCH 01/26] recommit for updates in build 2 --- CHANGELOG.md | 16 + REPOSTRUCTURE.md | 34 + doc/_index.html | 186 ++ doc/css/common.css | 8 + doc/css/full_list.css | 58 + doc/css/style.css | 492 ++++ doc/file.README.html | 307 +++ doc/frames.html | 17 + doc/index.html | 307 +++ doc/js/app.js | 248 ++ doc/js/full_list.js | 216 ++ doc/js/jquery.js | 4 + doc/puppet_class_list.html | 124 + doc/puppet_classes/cd_nagios.html | 149 ++ ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 217 ++ .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 197 ++ .../cd_nagios_3A_3Amain_3A_3Adirs.html | 478 ++++ .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 245 ++ .../cd_nagios_3A_3Amain_3A_3Auser.html | 210 ++ doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2145 +++++++++++++++++ .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 199 ++ ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 215 ++ .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 206 ++ .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 184 ++ doc/puppet_defined_type_list.html | 54 + .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 211 ++ doc/top-level-namespace.html | 100 + tests/UTF_Files | 7 + 28 files changed, 6834 insertions(+) create mode 100644 CHANGELOG.md create mode 100644 REPOSTRUCTURE.md create mode 100644 doc/_index.html create mode 100644 doc/css/common.css create mode 100644 doc/css/full_list.css create mode 100644 doc/css/style.css create mode 100644 doc/file.README.html create mode 100644 doc/frames.html create mode 100644 doc/index.html create mode 100644 doc/js/app.js create mode 100644 doc/js/full_list.js create mode 100644 doc/js/jquery.js create mode 100644 doc/puppet_class_list.html create mode 100644 doc/puppet_classes/cd_nagios.html create mode 100644 doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html create mode 100644 doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html create mode 100644 doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html create mode 100644 doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html create mode 100644 doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html create mode 100644 doc/puppet_classes/cd_nagios_3A_3Aparams.html create mode 100644 doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html create mode 100644 doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html create mode 100644 doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html create mode 100644 doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html create mode 100644 doc/puppet_defined_type_list.html create mode 100644 doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html create mode 100644 doc/top-level-namespace.html create mode 100644 tests/UTF_Files diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..1de8e3f --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,16 @@ +

Git Changelog changelog

+ +

+Changelog of Git Changelog. +

+ +

Unreleased

+

No issue

+ + +8db8758970310bf Arne Teuke 2017-07-20 13:31:19 +

+

recommitting to see if git can be fixed

+ +

+ diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md new file mode 100644 index 0000000..12e4ae8 --- /dev/null +++ b/REPOSTRUCTURE.md @@ -0,0 +1,34 @@ +. +|-- manifests +| |-- client +| | `-- target.pp +| |-- firewall +| | `-- iptables.pp +| |-- main +| | |-- config.pp +| | |-- dirs.pp +| | |-- install.pp +| | `-- user.pp +| |-- selinux +| | `-- config.pp +| |-- server +| | |-- access.pp +| | |-- access_rules.pp +| | |-- files.pp +| | `-- service.pp +| |-- init.pp +| `-- params.pp +|-- templates +| |-- nagios +| | |-- cgi_cfg.erb +| | |-- htpasswd_head.erb +| | `-- htpasswd_rule.erb +| `-- selinux +| `-- taccgi.erb +|-- Gemfile +|-- Gemfile.lock +|-- Jenkinsfile +|-- LICENSE +`-- README.md + +9 directories, 22 files diff --git a/doc/_index.html b/doc/_index.html new file mode 100644 index 0000000..af1095e --- /dev/null +++ b/doc/_index.html @@ -0,0 +1,186 @@ + + + + + + + Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Documentation by YARD 0.9.9

+
+

Alphabetic Index

+ +

Puppet Class Listing A-Z

+ + + + + + +
+ + + + +
+ + +

Defined Type Listing A-Z

+ + + + + + +
+ + + + +
+ + + + + +

File Listing

+ + +
+ + +
+ +
+ + + +
+ + \ No newline at end of file diff --git a/doc/css/common.css b/doc/css/common.css new file mode 100644 index 0000000..d28b093 --- /dev/null +++ b/doc/css/common.css @@ -0,0 +1,8 @@ +/* Ensure the search bar doesn't overlap with links */ +.fixed_header { + padding-bottom: 25px; +} + +#full_list { + padding-top: 15px; +} diff --git a/doc/css/full_list.css b/doc/css/full_list.css new file mode 100644 index 0000000..fa35982 --- /dev/null +++ b/doc/css/full_list.css @@ -0,0 +1,58 @@ +body { + margin: 0; + font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif; + font-size: 13px; + height: 101%; + overflow-x: hidden; + background: #fafafa; +} + +h1 { padding: 12px 10px; padding-bottom: 0; margin: 0; font-size: 1.4em; } +.clear { clear: both; } +.fixed_header { position: fixed; background: #fff; width: 100%; padding-bottom: 10px; margin-top: 0; top: 0; z-index: 9999; height: 70px; } +#search { position: absolute; right: 5px; top: 9px; padding-left: 24px; } +#content.insearch #search, #content.insearch #noresults { background: url(data:image/gif;base64,R0lGODlhEAAQAPYAAP///wAAAPr6+pKSkoiIiO7u7sjIyNjY2J6engAAAI6OjsbGxjIyMlJSUuzs7KamppSUlPLy8oKCghwcHLKysqSkpJqamvT09Pj4+KioqM7OzkRERAwMDGBgYN7e3ujo6Ly8vCoqKjY2NkZGRtTU1MTExDw8PE5OTj4+PkhISNDQ0MrKylpaWrS0tOrq6nBwcKysrLi4uLq6ul5eXlxcXGJiYoaGhuDg4H5+fvz8/KKiohgYGCwsLFZWVgQEBFBQUMzMzDg4OFhYWBoaGvDw8NbW1pycnOLi4ubm5kBAQKqqqiQkJCAgIK6urnJyckpKSjQ0NGpqatLS0sDAwCYmJnx8fEJCQlRUVAoKCggICLCwsOTk5ExMTPb29ra2tmZmZmhoaNzc3KCgoBISEiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCAAAACwAAAAAEAAQAAAHaIAAgoMgIiYlg4kACxIaACEJCSiKggYMCRselwkpghGJBJEcFgsjJyoAGBmfggcNEx0flBiKDhQFlIoCCA+5lAORFb4AJIihCRbDxQAFChAXw9HSqb60iREZ1omqrIPdJCTe0SWI09GBACH5BAkIAAAALAAAAAAQABAAAAdrgACCgwc0NTeDiYozCQkvOTo9GTmDKy8aFy+NOBA7CTswgywJDTIuEjYFIY0JNYMtKTEFiRU8Pjwygy4ws4owPyCKwsMAJSTEgiQlgsbIAMrO0dKDGMTViREZ14kYGRGK38nHguHEJcvTyIEAIfkECQgAAAAsAAAAABAAEAAAB2iAAIKDAggPg4iJAAMJCRUAJRIqiRGCBI0WQEEJJkWDERkYAAUKEBc4Po1GiKKJHkJDNEeKig4URLS0ICImJZAkuQAhjSi/wQyNKcGDCyMnk8u5rYrTgqDVghgZlYjcACTA1sslvtHRgQAh+QQJCAAAACwAAAAAEAAQAAAHZ4AAgoOEhYaCJSWHgxGDJCQARAtOUoQRGRiFD0kJUYWZhUhKT1OLhR8wBaaFBzQ1NwAlkIszCQkvsbOHL7Y4q4IuEjaqq0ZQD5+GEEsJTDCMmIUhtgk1lo6QFUwJVDKLiYJNUd6/hoEAIfkECQgAAAAsAAAAABAAEAAAB2iAAIKDhIWGgiUlh4MRgyQkjIURGRiGGBmNhJWHm4uen4ICCA+IkIsDCQkVACWmhwSpFqAABQoQF6ALTkWFnYMrVlhWvIKTlSAiJiVVPqlGhJkhqShHV1lCW4cMqSkAR1ofiwsjJyqGgQAh+QQJCAAAACwAAAAAEAAQAAAHZ4AAgoOEhYaCJSWHgxGDJCSMhREZGIYYGY2ElYebi56fhyWQniSKAKKfpaCLFlAPhl0gXYNGEwkhGYREUywag1wJwSkHNDU3D0kJYIMZQwk8MjPBLx9eXwuETVEyAC/BOKsuEjYFhoEAIfkECQgAAAAsAAAAABAAEAAAB2eAAIKDhIWGgiUlh4MRgyQkjIURGRiGGBmNhJWHm4ueICImip6CIQkJKJ4kigynKaqKCyMnKqSEK05StgAGQRxPYZaENqccFgIID4KXmQBhXFkzDgOnFYLNgltaSAAEpxa7BQoQF4aBACH5BAkIAAAALAAAAAAQABAAAAdogACCg4SFggJiPUqCJSWGgkZjCUwZACQkgxGEXAmdT4UYGZqCGWQ+IjKGGIUwPzGPhAc0NTewhDOdL7Ykji+dOLuOLhI2BbaFETICx4MlQitdqoUsCQ2vhKGjglNfU0SWmILaj43M5oEAOwAAAAAAAAAAAA==) no-repeat center left; } +#full_list { padding: 0; list-style: none; margin-left: 0; margin-top: 80px; font-size: 1.1em; } +#full_list ul { padding: 0; } +#full_list li { padding: 0; margin: 0; list-style: none; } +#full_list li .item { padding: 5px 5px 5px 12px; } +#noresults { padding: 7px 12px; background: #fff; } +#content.insearch #noresults { margin-left: 7px; } +li.collapsed ul { display: none; } +li a.toggle { cursor: default; position: relative; left: -5px; top: 4px; text-indent: -999px; width: 10px; height: 9px; margin-left: -10px; display: block; float: left; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAYAAABb0P4QAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK8AAACvABQqw0mAAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTM5jWRgMAAAAVdEVYdENyZWF0aW9uIFRpbWUAMy8xNC8wOeNZPpQAAAE2SURBVDiNrZTBccIwEEXfelIAHUA6CZ24BGaWO+FuzZAK4k6gg5QAdGAq+Bxs2Yqx7BzyL7Llp/VfzZeQhCTc/ezuGzKKnKSzpCxXJM8fwNXda3df5RZETlIt6YUzSQDs93sl8w3wBZxCCE10GM1OcWbWjB2mWgEH4Mfdyxm3PSepBHibgQE2wLe7r4HjEidpnXMYdQPKEMJcsZ4zs2POYQOcaPfwMVOo58zsAdMt18BuoVDPxUJRacELbXv3hUIX2vYmOUvi8C8ydz/ThjXrqKqqLbDIAdsCKBd+Wo7GWa7o9qzOQHVVVXeAbs+yHHCH4aTsaCOQqunmUy1yBUAXkdMIfMlgF5EXLo2OpV/c/Up7jG4hhHcYLgWzAZXUc2b2ixsfvc/RmNNfOXD3Q/oeL9axJE1yT9IOoUu6MGUkAAAAAElFTkSuQmCC) no-repeat bottom left; } +li.collapsed a.toggle { opacity: 0.5; cursor: default; background-position: top left; } +li { color: #888; cursor: pointer; } +li.deprecated { text-decoration: line-through; font-style: italic; } +li.odd { background: #f0f0f0; } +li.even { background: #fafafa; } +.item:hover { background: #ddd; } +li small:before { content: "("; } +li small:after { content: ")"; } +li small.search_info { display: none; } +a, a:visited { text-decoration: none; color: #05a; } +li.clicked > .item { background: #05a; color: #ccc; } +li.clicked > .item a, li.clicked > .item a:visited { color: #eee; } +li.clicked > .item a.toggle { opacity: 0.5; background-position: bottom right; } +li.collapsed.clicked a.toggle { background-position: top right; } +#search input { border: 1px solid #bbb; border-radius: 3px; } +#full_list_nav { margin-left: 10px; font-size: 0.9em; display: block; color: #aaa; } +#full_list_nav a, #nav a:visited { color: #358; } +#full_list_nav a:hover { background: transparent; color: #5af; } +#full_list_nav span:after { content: ' | '; } +#full_list_nav span:last-child:after { content: ''; } + +#content h1 { margin-top: 0; } +li { white-space: nowrap; cursor: normal; } +li small { display: block; font-size: 0.8em; } +li small:before { content: ""; } +li small:after { content: ""; } +li small.search_info { display: none; } +#search { width: 170px; position: static; margin: 3px; margin-left: 10px; font-size: 0.9em; color: #888; padding-left: 0; padding-right: 24px; } +#content.insearch #search { background-position: center right; } +#search input { width: 110px; } + +#full_list.insearch ul { display: block; } +#full_list.insearch .item { display: none; } +#full_list.insearch .found { display: block; padding-left: 11px !important; } +#full_list.insearch li a.toggle { display: none; } +#full_list.insearch li small.search_info { display: block; } diff --git a/doc/css/style.css b/doc/css/style.css new file mode 100644 index 0000000..f682a69 --- /dev/null +++ b/doc/css/style.css @@ -0,0 +1,492 @@ +html { + width: 100%; + height: 100%; +} +body { + font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif; + font-size: 13px; + width: 100%; + margin: 0; + padding: 0; + display: flex; + display: -webkit-flex; + display: -ms-flexbox; +} + +#nav { + position: relative; + width: 100%; + height: 100%; + border: 0; + border-right: 1px dotted #eee; + overflow: auto; +} +.nav_wrap { + margin: 0; + padding: 0; + width: 20%; + height: 100%; + position: relative; + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + flex-shrink: 0; + -webkit-flex-shrink: 0; + -ms-flex: 1 0; +} +#resizer { + position: absolute; + right: -5px; + top: 0; + width: 10px; + height: 100%; + cursor: col-resize; + z-index: 9999; +} +#main { + flex: 5 1; + -webkit-flex: 5 1; + -ms-flex: 5 1; + outline: none; + position: relative; + background: #fff; + padding: 1.2em; + padding-top: 0.2em; +} + +@media (max-width: 920px) { + .nav_wrap { width: 100%; top: 0; right: 0; overflow: visible; position: absolute; } + #resizer { display: none; } + #nav { + z-index: 9999; + background: #fff; + display: none; + position: absolute; + top: 40px; + right: 12px; + width: 500px; + max-width: 80%; + height: 80%; + overflow-y: scroll; + border: 1px solid #999; + border-collapse: collapse; + box-shadow: -7px 5px 25px #aaa; + border-radius: 2px; + } +} + +@media (min-width: 920px) { + body { height: 100%; overflow: hidden; } + #main { height: 100%; overflow: auto; } + #search { display: none; } +} + +#main img { max-width: 100%; } +h1 { font-size: 25px; margin: 1em 0 0.5em; padding-top: 4px; border-top: 1px dotted #d5d5d5; } +h1.noborder { border-top: 0px; margin-top: 0; padding-top: 4px; } +h1.title { margin-bottom: 10px; } +h1.alphaindex { margin-top: 0; font-size: 22px; } +h2 { + padding: 0; + padding-bottom: 3px; + border-bottom: 1px #aaa solid; + font-size: 1.4em; + margin: 1.8em 0 0.5em; + position: relative; +} +h2 small { font-weight: normal; font-size: 0.7em; display: inline; position: absolute; right: 0; } +h2 small a { + display: block; + height: 20px; + border: 1px solid #aaa; + border-bottom: 0; + border-top-left-radius: 5px; + background: #f8f8f8; + position: relative; + padding: 2px 7px; +} +.clear { clear: both; } +.inline { display: inline; } +.inline p:first-child { display: inline; } +.docstring, .tags, #filecontents { font-size: 15px; line-height: 1.5145em; } +.docstring p > code, .docstring p > tt, .tags p > code, .tags p > tt { + color: #c7254e; background: #f9f2f4; padding: 2px 4px; font-size: 1em; + border-radius: 4px; +} +.docstring h1, .docstring h2, .docstring h3, .docstring h4 { padding: 0; border: 0; border-bottom: 1px dotted #bbb; } +.docstring h1 { font-size: 1.2em; } +.docstring h2 { font-size: 1.1em; } +.docstring h3, .docstring h4 { font-size: 1em; border-bottom: 0; padding-top: 10px; } +.summary_desc .object_link a, .docstring .object_link a { + font-family: monospace; font-size: 1.05em; + color: #05a; background: #EDF4FA; padding: 2px 4px; font-size: 1em; + border-radius: 4px; +} +.rdoc-term { padding-right: 25px; font-weight: bold; } +.rdoc-list p { margin: 0; padding: 0; margin-bottom: 4px; } +.summary_desc pre.code .object_link a, .docstring pre.code .object_link a { + padding: 0px; background: inherit; color: inherit; border-radius: inherit; +} + +/* style for */ +#filecontents table, .docstring table { border-collapse: collapse; } +#filecontents table th, #filecontents table td, +.docstring table th, .docstring table td { border: 1px solid #ccc; padding: 8px; padding-right: 17px; } +#filecontents table tr:nth-child(odd), +.docstring table tr:nth-child(odd) { background: #eee; } +#filecontents table tr:nth-child(even), +.docstring table tr:nth-child(even) { background: #fff; } +#filecontents table th, .docstring table th { background: #fff; } + +/* style for
a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="
"+""+"
",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
t
",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="
",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; +f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() +{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html new file mode 100644 index 0000000..ed0adf4 --- /dev/null +++ b/doc/puppet_class_list.html @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + Puppet Class List + + + +
+
+

Puppet Class List

+ + + +
+ + +
+ + diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html new file mode 100644 index 0000000..dc07105 --- /dev/null +++ b/doc/puppet_classes/cd_nagios.html @@ -0,0 +1,149 @@ + + + + + + + Puppet Class: cd_nagios + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: cd_nagios

+
+ + +
+
Defined in:
+
+ manifests/init.pp +
+
+
+ +

Summary

+ Class initialises the cd_nagios Module. + +

Overview

+
+
+ +

cd_nagios::init.pp +Module name: cd_nagios +Author: Arne Teuke +(arne_teuke@confdroid.com) +License: + This file is part of cd_nagios.

+ +

cd_nagios is used for providing automatic configuration of Nagios + +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/.

+ +
+
+
+ + +
+
+ + + + +
+ 
+
+
+23
+24
+25
+ 		+ 
# File 'manifests/init.pp', line 23
+
+class cd_nagios {
+  include cd_nagios::params
+}
+
+ + + + + + + + \ No newline at end of file diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html new file mode 100644 index 0000000..ac65ab4 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -0,0 +1,217 @@ + + + + + + + Puppet Class: cd_nagios::firewall::iptables + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: cd_nagios::firewall::iptables

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

Summary

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

Overview

+
+
+ +

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

+ +

cd_nagios is used for providing automatic configuration of + <service / +purpose> + 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
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+ 		+ 
# File 'manifests/firewall/iptables.pp', line 24
+
+class cd_nagios::firewall::iptables (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    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',
+      }
+    }
+
+    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',
+      }
+
+      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',
+        }
+      }
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html new file mode 100644 index 0000000..723a1f0 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -0,0 +1,197 @@ + + + + + + + Puppet Class: cd_nagios::main::config + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: cd_nagios::main::config

+
+ +
+
Inherits:
+
cd_nagios::params
+
+ + +
+
Defined in:
+
+ manifests/main/config.pp +
+
+
+ +

Summary

+ Class manages all aspects of configuring the module logic for +cd_nagios. + +

Overview

+
+
+ +

cd_nagios::main::config.pp +Module name: cd_nagios +Author: Arne Teuke +(arne_teuke@ConfDroid.com)

+ +

License:

+ +

This file is part of cd_nagios.

+ +

cd_nagios is used for providing automatic configuration of Nagios + +Copyright (C) 2016 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
+43
+44
+45
+46
+ 		+ 
# File 'manifests/main/config.pp', line 24
+
+class cd_nagios::main::config (
+
+) inherits cd_nagios::params {
+
+  # manage server configuration
+
+  if $::fqdn == $ng_nagios_server {
+    include cd_nagios::server::service
+
+    if $ng_include_fw == true {
+      include cd_nagios::firewall::iptables
+    }
+
+    if $ng_use_selinux_tools == true {
+      include cd_nagios::selinux::config
+    }
+  }
+
+  if $::fqdn != $ng_nagios_server {
+    include cd_nagios::client::target
+  }
+
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html new file mode 100644 index 0000000..5790533 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -0,0 +1,478 @@ + + + + + + + Puppet Class: cd_nagios::main::dirs + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: cd_nagios::main::dirs

+
+ +
+
Inherits:
+
cd_nagios::params
+
+ + +
+
Defined in:
+
+ manifests/main/dirs.pp +
+
+
+ +

Summary

+ Class manages all directories required for cd_nagios. + +

Overview

+
+
+ +

cd_nagios::main::dirs.pp +Module name: cd_nagios +Author: Arne Teuke +(arne_teuke@ConfDroid.com)

+ +

License:

+ +

This file is part of cd_nagios.

+ +

cd_nagios is used for providing automatic configuration of Nagios. + +Copyright (C) 2016 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/.

+ +
+
+
+ + +
+ + + + + +
+ 
+
+
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+ 		+ 
# File 'manifests/main/dirs.pp', line 23
+
+class cd_nagios::main::dirs (
+
+) inherits cd_nagios::params {
+
+  require cd_nagios::main::user
+
+  # main directory
+
+  file { $ng_main_dir:
+    ensure    =>  directory,
+    path      =>  $ng_main_dir,
+    owner     =>  'root',
+    group     =>  'root',
+    mode      =>  '0755',
+    selrange  =>  s0,
+    selrole   =>  object_r,
+    seltype   =>  nagios_etc_t,
+    seluser   =>  system_u,
+  }
+
+  # /usr/lib64/nagios dir required for plugins
+
+  file { $ng_lib_dir:
+    ensure    =>  directory,
+    path      =>  $ng_lib_dir,
+    owner     =>  'root',
+    group     =>  'root',
+    mode      =>  '0755',
+    selrange  =>  s0,
+    selrole   =>  object_r,
+    seltype   =>  lib_t,
+    seluser   =>  system_u,
+  }
+
+  # /var/spool/nagios
+
+  file { $ng_spool_dir:
+    ensure    =>  directory,
+    path      =>  $ng_spool_dir,
+    owner     =>  $ng_user,
+    group     =>  $ng_user,
+    mode      =>  '0755',
+    selrange  =>  s0,
+    selrole   =>  object_r,
+    seltype   =>  nagios_spool_t,
+    seluser   =>  system_u,
+  }
+
+
+  if $::fqdn == $ng_nagios_server {
+
+    # /etc/nagios/conf.d 
+
+    file { $ng_conf_d_dir:
+      ensure    =>  directory,
+      path      =>  $ng_conf_d_dir,
+      owner     =>  'root',
+      group     =>  $ng_user,
+      mode      =>  '0750',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+    }
+
+    # /etc/nagios/objects
+
+    file { $ng_objects_dir:
+      ensure    =>  directory,
+      path      =>  $ng_objects_dir,
+      owner     =>  'root',
+      group     =>  $ng_user,
+      mode      =>  '0750',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+    }
+
+    # /etc/nagios/private
+
+    file { $ng_private_dir:
+      ensure    =>  directory,
+      path      =>  $ng_private_dir,
+      owner     =>  'root',
+      group     =>  $ng_user,
+      mode      =>  '0750',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+    }
+
+    # include dir
+
+    file { $ng_usr_incl:
+      ensure    =>  directory,
+      path      =>  $ng_usr_incl,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0755',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  usr_t,
+      seluser   =>  system_u,
+    }
+
+    # log dir
+
+    file { $ng_log_dir:
+      ensure    =>  directory,
+      path      =>  $ng_log_dir,
+      owner     =>  $ng_user,
+      group     =>  $ng_user,
+      mode      =>  '0750',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_log_t,
+      seluser   =>  system_u,
+    }
+
+    # log archives
+
+    file { $ng_log_archives:
+      ensure    =>  directory,
+      path      =>  $ng_log_archives,
+      owner     =>  $ng_user,
+      group     =>  $ng_user,
+      mode      =>  '0750',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_log_t,
+      seluser   =>  system_u,
+    }
+
+    # /usr/share/nagios
+
+    file { $ng_usr_share:
+      ensure    =>  directory,
+      path      =>  $ng_usr_share,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0755',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  usr_t,
+      seluser   =>  system_u,
+    }
+
+    #  /usr/share/nagios/html
+
+    file { $ng_share_html:
+      ensure    =>  directory,
+      path      =>  $ng_share_html,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0755',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  usr_t,
+      seluser   =>  system_u,
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html new file mode 100644 index 0000000..0e64841 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -0,0 +1,245 @@ + + + + + + + Puppet Class: cd_nagios::main::install + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: cd_nagios::main::install

+
+ +
+
Inherits:
+
cd_nagios::params
+
+ + +
+
Defined in:
+
+ manifests/main/install.pp +
+
+
+ +

Summary

+ Class manage all aspects of installing binaries required for +cd_nagios + +

Overview

+
+
+ +

cd_nagios::main::install.pp +Module name: cd_nagios +Author: Arne Teuke +(arne_teuke@ConfDroid.com)

+ +

License:

+ +

This file is part of cd_nagios.

+ +

cd_nagios is used for providing automatic configuration of Nagios. + +Copyright (C) 2016 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
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+ 		+ 
# File 'manifests/main/install.pp', line 24
+
+class cd_nagios::main::install (
+
+) inherits cd_nagios::params {
+
+  require cd_resources
+
+  # if our FQDN matches the configured Nagios server FQDN, install both server-
+  # and client packages.
+
+  if $::fqdn == $ng_nagios_server {
+
+    # we'll need httpd installed
+    require cd_apache
+
+    package {$reqpackages_server:
+      ensure => $pkg_ensure,
+    }
+    package {$reqpackages_client:
+      ensure => $pkg_ensure,
+    }
+
+    # install NRPE if enabled
+
+    if $ng_include_nrpe == true {
+
+      package {$reqpackages_nrpe:
+        ensure => $pkg_ensure,
+      }
+    }
+  }
+
+  # if we are not the nagios server, install client packages
+
+  if $::fqdn != $ng_nagios_server {
+    package {$reqpackages_client:
+      ensure => $pkg_ensure,
+    }
+
+    # if we want o use NRPE, install it
+
+    if $ng_include_nrpe == true {
+      package {$reqpackages_nrpe:
+        ensure => $pkg_ensure,
+      }
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html new file mode 100644 index 0000000..a79da72 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -0,0 +1,210 @@ + + + + + + + Puppet Class: cd_nagios::main::user + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: cd_nagios::main::user

+
+ +
+
Inherits:
+
cd_nagios::params
+
+ + +
+
Defined in:
+
+ manifests/main/user.pp +
+
+
+ +

Summary

+ Class manages service users for cd_nagios. + +

Overview

+
+
+ +

cd_nagios::main::user.pp +Module name: cd_nagios +Author: Arne Teuke +(arne_teuke@ConfDroid.com)

+ +

License:

+ +

This file is part of cd_nagios.

+ +

cd_nagios is used for providing automatic configuration of Nagios + +Copyright (C) 2016 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/.

+ +
+
+
+ + +
+ + + + + +
+ 
+
+
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+ 		+ 
# File 'manifests/main/user.pp', line 23
+
+class cd_nagios::main::user (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+  require cd_nagios::main::install
+
+    group { $ng_user:
+      ensure          =>  present,
+      name            =>  $ng_user,
+      gid             =>  $ng_u_uid,
+      allowdupe       =>  false,
+    }
+
+    user {  $ng_user:
+      ensure          =>  present,
+      name            =>  $ng_user,
+      allowdupe       =>  false,
+      comment         =>  $ng_u_comment,
+      uid             =>  $ng_u_uid,
+      gid             =>  $ng_user,
+      groups          =>  $ng_u_groups,
+      managehome      =>  true,
+      home            =>  $ng_user_home,
+      shell           =>  $ng_user_shell,
+      require         =>  Group[$ng_user],
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html new file mode 100644 index 0000000..3722574 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -0,0 +1,2145 @@ + + + + + + + Puppet Class: cd_nagios::params + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: cd_nagios::params

+
+ + +
+
Inherited by:
+
+ + cd_nagios::main::dirs
+ + cd_nagios::main::user
+ + cd_nagios::main::config
+ + cd_nagios::main::install
+ + cd_nagios::server::files
+ + cd_nagios::selinux::config
+ + cd_nagios::server::service
+ + cd_nagios::firewall::iptables
+ + cd_nagios::server::access_rules
+ +
+
+ +
+
Defined in:
+
+ manifests/params.pp +
+
+
+ +

Summary

+ Class holds all parameters for the cd_nagios module and is +inherited by all classes except defines. + +

Overview

+
+
+ +

cd_nagios::params.pp +Module name: cd_nagios +Author: Arne Teuke +(arne_teuke@ConfDroid.com)

+ +

License:

+ +

This file is part of cd_nagios.

+ +

cd_nagios is used for providing automatic configuration of Nagios. + +Copyright (C) 2016 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/. + to connect +to NRPE, which as of now does not trust DNS names. Must be the + public +interface in case of NAT environments. +can issue host related commands. +can +issue service related commands.

+ +
+
+
+

Parameters:

+
    + +
  • + + pkg_ensure + + + (string) + + + (defaults to: 'latest') + + + — +
    +

    which package +type +to choose, i.e. latest or present.

    +
    + +
    • + +
  • + + ng_nagios_server + + + (string) + + + (defaults to: "nagios.${::domain}") + + + — +
    +

    Specify the FQDN of the nagios server host. +Must be a proper A-name, no +CNAME i.e. on Loadbalancers. When the FQDN +matches the configured value, +Nagios server components will be installed +and the clients will allow to be +connected by that host. Impacts also +firewall ports (optional).

    +
    + +
    • + +
  • + + ng_nagios_ext_ip + + + (string) + + + (defaults to: undef) + + + — +
    +

    Specify the IP address of the +nagios server. Required for NRPE +configuration to allow the Nagios server

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

    Whether to include NRPE to allow +Nagios to connect to clients

    +
    + +
    • + +
  • + + ng_ping_warn + + + (string) + + + (defaults to: '100.0,20%') + + + — +
    +

    Default value for ping warning check. Can be +overridden on host level.

    +
    + +
    • + +
  • + + ng_ping_crit + + + (string) + + + (defaults to: '500.0,60%') + + + — +
    +

    Default value for ping critical check. Can be +overridden on host level.

    +
    + +
    • + +
  • + + ng_ping_ensure + + + (boolean) + + + (defaults to: 'present') + + + — +
    +

    Wheter to include or exclude the check. +Can be overridden on host level.

    +
    + +
    • + +
  • + + ng_disk_warn + + + (string) + + + (defaults to: '20%') + + + — +
    +

    Default value for disk space warning check. +Can be overridden on host +level.

    +
    + +
    • + +
  • + + ng_disk_crit + + + (string) + + + (defaults to: '10%') + + + — +
    +

    Default value for disk space critical check +Can be overridden on host +level.

    +
    + +
    • + +
  • + + ng_disk_ensure + + + (boolean) + + + (defaults to: 'present') + + + — +
    +

    Whether to include or exclude the check. +Can be overridden on host level.

    +
    + +
    • + +
  • + + ng_swap_warn + + + (string) + + + (defaults to: '20') + + + — +
    +

    Default value for swap space warning check. +Can be overridden on host +level.

    +
    + +
    • + +
  • + + ng_swap_crit + + + (string) + + + (defaults to: '10') + + + — +
    +

    Default value for swap space critical check. +Can be overridden on host +level.

    +
    + +
    • + +
  • + + ng_swap_ensure + + + (boolean) + + + (defaults to: 'present') + + + — +
    +

    Whether to include or exclude the check. +Can be overridden on host level.

    +
    + +
    • + +
  • + + ng_users_warn + + + (string) + + + (defaults to: '20') + + + — +
    +

    Default value for user logins warning check. +Can be overridden on host +level.

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

    Default value for user logins critical check +Can be overridden on host +level.

    +
    + +
    • + +
  • + + ng_users_ensure + + + (boolean) + + + (defaults to: 'present') + + + — +
    +

    Whether to include or exclude the check. +Can be overridden on host level.

    +
    + +
    • + +
  • + + ng_procs_tot_warn + + + (string) + + + (defaults to: '330') + + + — +
    +

    Default warning for the total processes +warning check. Can be overridden on +host level.

    +
    + +
    • + +
  • + + ng_procs_tot_crit + + + (string) + + + (defaults to: '400') + + + — +
    +

    Default warning for the total processes +critical check. Can be overridden +on host level.

    +
    + +
    • + +
  • + + ng_procs_tot_param + + + (string) + + + (defaults to: 'RDST') + + + — +
    +

    Default value for the process flags to be +checked. Can be overridden on +host level.

    +
    + +
    • + +
  • + + ng_procs_tot_ens + + + (boolean) + + + (defaults to: 'present') + + + — +
    +

    Whether to include or exclude the check. +Can be overridden on host level.

    +
    + +
    • + +
  • + + ng_procs_z_warn + + + (string) + + + (defaults to: '10') + + + — +
    +

    Default value for the zombie processes +warning check. Can be overridden on +host level.

    +
    + +
    • + +
  • + + ng_procs_z_crit + + + (string) + + + (defaults to: '30') + + + — +
    +

    Default value for the zombie processess +critical check. Can be overridden +on host level.

    +
    + +
    • + +
  • + + ng_procs_z_param + + + (string) + + + (defaults to: 'Z') + + + — +
    +

    Default value for the zombie processes flag. +Can be overridden on host +level.

    +
    + +
    • + +
  • + + ng_procs_z_ensure + + + (boolean) + + + (defaults to: 'present') + + + — +
    +

    Whether to include or exclude the check. +Can be overridden on host level.

    +
    + +
    • + +
  • + + ng_load_warn + + + (string) + + + (defaults to: '5.00,4.00,3.00') + + + — +
    +

    Default value for the load warning check. +Can be overridden on host level.

    +
    + +
    • + +
  • + + ng_load_crit + + + (string) + + + (defaults to: '10.00,6.00,4.00') + + + — +
    +

    Default value for the load critical check. +Can be overridden on host level.

    +
    + +
    • + +
  • + + ng_load_ensure + + + (boolean) + + + (defaults to: 'present') + + + — +
    +

    Whether to include or exclude the load check. +Can be overridden on host +level.

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

    Whether to include firewall management. +requires cd_firewall or +puppetlabs-firewall module.

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

    Prefix for the port number to establish proper +firewall rule ordering.

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

    Whether to use https.

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

    Whether we want to forward http to https. +only active if +ng_use_https is set to true.

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

    Specify the port to use for httpd. Used in +templates and for firewall +(Optional)

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

    Specify the port to use for httpd. Used in +templates and for firewall +(Optional)

    +
    + +
    • + +
  • + + ng_user + + + (string) + + + (defaults to: 'nagios') + + + — +
    +

    The name of the Nagios service user.

    +
    + +
    • + +
  • + + ng_user_home + + + (string) + + + (defaults to: '/var/spool/nagios') + + + — +
    +

    The home directory for the Nagios service user

    +
    + +
    • + +
  • + + ng_user_shell + + + (string) + + + (defaults to: '/bin/bash') + + + — +
    +

    The shell for the Nagios service user, which +never should be allowed to +login.

    +
    + +
    • + +
  • + + ng_u_comment + + + (string) + + + (defaults to: 'Nagios service user') + + + — +
    +

    The comment for the Nagios service user for +/etc/passwd. Shows up in email +notifocations from the Nagios daemon.

    +
    + +
    • + +
  • + + ng_u_uid + + + (string) + + + (defaults to: '1004') + + + — +
    +

    The UID for the Nagios service user. Important when +using shared +environments like NFS.

    +
    + +
    • + +
  • + + ng_u_groups + + + (string) + + + (defaults to: undef) + + + — +
    +

    The secondary groups for the Nagios service user. +Must not contain the +primary group.

    +
    + +
    • + +
  • + + ng_context_help + + + (string) + + + (defaults to: '1') + + + — +
    +

    whether or not a context-sensitive +help icon will be displayed for most of +the CGIs.

    +
    + +
    • + +
  • + + ng_pending_state + + + (string) + + + (defaults to: '1') + + + — +
    +

    what states should be displayed in the web +interface for hosts/services +that have not yet been checked

    +
    + +
    • + +
  • + + ng_use_auth + + + (string) + + + (defaults to: '1') + + + — +
    +

    whether or not the CGIs will use any +authentication when displaying host +and service information, as +well as committing commands to Nagios for +processing. This should not +be set to 0.

    +
    + +
    • + +
  • + + ng_use_ssl_auth + + + (string) + + + (defaults to: '0') + + + — +
    +

    allows you to use x509 cert (SSL) +authentication in the CGIs. This is an +advanced option and should +not be enabled unless you know what you're +doing.

    +
    + +
    • + +
  • + + ng_enable_def_user + + + (boolean) + + + (defaults to: false) + + + — +
    +

    Whether to enable a default user +(not recommended).

    +
    + +
    • + +
  • + + ng_def_user_name + + + (string) + + + (defaults to: 'nagios_insecure') + + + — +
    +

    default user name that can +access pages without authentication. This allows +people within a +secure domain (i.e., behind a firewall) to see the current +status +without authenticating. Only actuve if +ng_enable_def_user is set to true

    +
    + +
    • + +
  • + + ng_nagios_admin + + + (string) + + + (defaults to: 'nagios_sec_adm') + + + — +
    +

    Specify the name of a nagios administration +user here. Value will be used +in cgi.cfg for all authorized commands and info, +i.e. nagiosadmin. however, +its stronlgly suggested to use a different name. +Can be overridden per host +/ hostgroups, so allows flexibility and increased +security. You can also +add a comma-separated list of people in here instead, +which then would +function like a group instead a single user.

    +
    + +
    • + +
  • + + ng_sysinfo_auth + + + (string) + + + (defaults to: '') + + + — +
    +

    comma-delimited list of all usernames that +have access to viewing the +Nagios process information as +provided by the Extended Information CGI +(extinfo.cgi).

    +
    + +
    • + +
  • + + ng_confinfo_auth + + + (string) + + + (defaults to: '') + + + — +
    +

    comma-delimited list of all usernames that +can view ALL configuration +information (hosts, commands, etc).

    +
    + +
    • + +
  • + + ng_command_auth + + + (string) + + + (defaults to: '') + + + — +
    +

    comma-delimited list of all usernames that +can issue shutdown and restart +commands to Nagios via the +command CGI (cmd.cgi).

    +
    + +
    • + +
  • + + ng_hostview_auth + + + (string) + + + (defaults to: '') + + + — +
    +

    comma-delimited lists of all usernames that +can view information for all +hosts

    +
    + +
    • + +
  • + + ng_serviceview_auth + + + (string) + + + (defaults to: '') + + + — +
    +

    comma-delimited lists of all usernames +that can view information for all +services.

    +
    + +
    • + +
  • + + ng_host_cmd_auth + + + (string) + + + (defaults to: '') + + + — +
    +

    comma-delimited lists of all usernames that

    +
    + +
    • + +
  • + + ng_svc_cmd_auth + + + (string) + + + (defaults to: '') + + + — +
    +

    comma-delimited lists of all usernames that

    +
    + +
    • + +
  • + + ng_readonly_auth + + + (string) + + + (defaults to: '') + + + — +
    +

    comma-delimited list of usernames that have +read-only rights in the CGIs.

    +
    + +
    • + +
  • + + ng_statusmap_img + + + (string) + + + (defaults to: 'smbackground.gd2') + + + — +
    +

    specify an image to be used as a +background in the statusmap CGI.

    +
    + +
    • + +
  • + + ng_use_colormap + + + (boolean) + + + (defaults to: false) + + + — +
    +

    Whether to set values of background colors.

    +
    + +
    • + +
  • + + ng_colormap_red + + + (string) + + + (defaults to: '255') + + + — +
    +

    value for the red area of the color map.

    +
    + +
    • + +
  • + + ng_colormap_green + + + (string) + + + (defaults to: '255') + + + — +
    +

    value for the green area of the color map

    +
    + +
    • + +
  • + + ng_colormap_blue + + + (string) + + + (defaults to: '255') + + + — +
    +

    value for the blue area of the color map.

    +
    + +
    • + +
  • + + ng_statusmap_layout + + + (string) + + + (defaults to: '6') + + + — +
    +

    Value for the default statusmap layout.

    +
    + +
    • + +
  • + + ng_wrl_layout + + + (string) + + + (defaults to: '4') + + + — +
    +

    Value for the default statuswrl layout.

    +
    + +
    • + +
  • + + ng_incl_own_wrl + + + (boolean) + + + (defaults to: false) + + + — +
    +

    Whether to include your own objects in the +generated VRML world.

    +
    + +
    • + +
  • + + ng_statuswrl_include + + + (string) + + + (defaults to: '') + + + — +
    +

    Specify your own wrl object to be +included in the generated VRML world. +Only active if ng_incl_own_wrl +is set to true.

    +
    + +
    • + +
  • + + ng_ping_syntax + + + (string) + + + (defaults to: '/bin/ping -n -U -c 5 $HOSTADDRESS$') + + + — +
    +

    what syntax should be used when +attempting to ping a host from the WAP +interface

    +
    + +
    • + +
  • + + ng_refresh_rate + + + (string) + + + (defaults to: '90') + + + — +
    +

    specify the refresh rate in seconds +of various CGIs

    +
    + +
    • + +
  • + + ng_result_limit + + + (string) + + + (defaults to: '100') + + + — +
    +

    specify the default number of results +displayed on the status.cgi.

    +
    + +
    • + +
  • + + ng_escape_html + + + (string) + + + (defaults to: '1') + + + — +
    +

    whether HTML tags in host and service +status output is escaped in the web +interface. If enabled, +your plugin output will not be able to contain +clickable links.

    +
    + +
    • + +
  • + + ng_use_sound + + + (boolean) + + + (defaults to: false) + + + — +
    +

    whether to enable sound usage.

    +
    + +
    • + +
  • + + ng_host_unreachable + + + (string) + + + (defaults to: 'hostdown.wav') + + + — +
    +

    soundfile for host unreachable +Only active if +ng_use_sound is set to true.

    +
    + +
    • + +
  • + + ng_host_down + + + (string) + + + (defaults to: 'hostdown.wav') + + + — +
    +

    soundfile for host down +Only active if +ng_use_sound is set to true.

    +
    + +
    • + +
  • + + ng_svc_critical + + + (string) + + + (defaults to: 'critical.wav') + + + — +
    +

    soundfile for service critical. +Only active if +ng_use_sound is set to true.

    +
    + +
    • + +
  • + + ng_svc_warn + + + (string) + + + (defaults to: 'warning.wav') + + + — +
    +

    soundfile for service warning +Only active if +ng_use_sound is set to true.

    +
    + +
    • + +
  • + + ng_svc_unknown + + + (string) + + + (defaults to: 'warning.wav') + + + — +
    +

    soundfile for service unknown +Only active if +ng_use_sound is set to true.

    +
    + +
    • + +
  • + + ng_normal_sound + + + (string) + + + (defaults to: 'noproblem.wav') + + + — +
    +

    soundfile for normal +Only active if ng_use_sound +is set to true.

    +
    + +
    • + +
  • + + ng_action_url_target + + + (string) + + + (defaults to: '_blank') + + + — +
    +

    Specify target frames in which +action URLs will open

    +
    + +
    • + +
  • + + ng_notes_url_target + + + (string) + + + (defaults to: '_blank') + + + — +
    +

    Specify target frames in which +notes URLs will open

    +
    + +
    • + +
  • + + ng_lock_author_names + + + (string) + + + (defaults to: '1') + + + — +
    +

    whether users can change the author +name when submitting comments, +scheduling downtime.

    +
    + +
    • + +
  • + + ng_enable_splunk + + + (boolean) + + + (defaults to: false) + + + — +
    +

    Whether to enable splunk integration.

    +
    + +
    • + +
  • + + ng_splunk_url + + + (string) + + + (defaults to: 'http://127.0.0.1:8000/') + + + — +
    +

    the URL for your Splunk URL

    +
    + +
    • + +
  • + + ng_navbar_addresses + + + (string) + + + (defaults to: '1') + + + — +
    +

    allow navbar search queries IP addresses

    +
    + +
    • + +
  • + + ng_navbar_aliases + + + (string) + + + (defaults to: '1') + + + — +
    +

    allow navbar search for aliases

    +
    + +
    • + +
  • + + ng_ack_no_sticky + + + (string) + + + (defaults to: '0') + + + — +
    +

    Enabling ack_no_sticky will default the +"Sticky Acknowledgement" +to be unchecked.

    +
    + +
    • + +
  • + + ng_ack_no_send + + + (string) + + + (defaults to: '0') + + + — +
    +

    Enabling ack_no_send will default the +"Send Notification" to be +unchecked.

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

    Whether to enable selinux tools and +policies. only effective if selinux is +enabled.

    +
    + +
    • + +
+ + +

See Also:

+ + +
+ + + + + +
+ 
+
+
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273
+274
+275
+276
+277
+278
+279
+280
+281
+282
+283
+284
+285
+286
+287
+288
+289
+290
+291
+292
+293
+294
+295
+296
+297
+298
+299
+300
+301
+302
+303
+304
+305
+306
+307
+308
+309
+310
+311
+312
+313
+314
+315
+316
+317
+318
+319
+320
+321
+322
+323
+324
+325
+326
+327
+328
+329
+330
+331
+332
+333
+334
+335
+336
+337
+338
+339
+340
+341
+342
+343
+344
+345
+346
+347
+ 		+ 
# File 'manifests/params.pp', line 198
+
+class cd_nagios::params (
+
+$pkg_ensure           = 'latest',
+
+$ng_nagios_server     = "nagios.${::domain}",
+$ng_nagios_ext_ip     = undef,
+
+$ng_include_nrpe      = true,
+
+# firewall
+$ng_include_fw        = true,
+$ng_use_https         = true,
+$ng_http_https_fw     = true,
+$ng_fw_order          = '50',
+$ng_http_port         = '80',
+$ng_https_port        = '443',
+
+# check command parameters
+## ping
+$ng_ping_warn         = '100.0,20%',
+$ng_ping_crit         = '500.0,60%',
+$ng_ping_ensure       = 'present',
+## disk
+$ng_disk_warn         = '20%',
+$ng_disk_crit         = '10%' ,
+$ng_disk_ensure       = 'present',
+# swap
+$ng_swap_warn         = '20',
+$ng_swap_crit         = '10',
+$ng_swap_ensure       = 'present',
+# users
+$ng_users_warn        = '20',
+$ng_users_crit        = '50',
+$ng_users_ensure      = 'present',
+#total procs
+$ng_procs_tot_warn    = '330',
+$ng_procs_tot_crit    = '400',
+$ng_procs_tot_param   = 'RDST',
+$ng_procs_tot_ens     = 'present',
+# zombie procs
+$ng_procs_z_warn      = '10',
+$ng_procs_z_crit      = '30',
+$ng_procs_z_param     = 'Z',
+$ng_procs_z_ensure    = 'present',
+# load
+$ng_load_warn         = '5.00,4.00,3.00',
+$ng_load_crit         = '10.00,6.00,4.00',
+$ng_load_ensure       = 'present',
+
+# user settings
+$ng_user              = 'nagios',
+$ng_u_comment         = 'Nagios service user',
+$ng_u_uid             = '1004',
+$ng_user_home         = '/var/spool/nagios',
+$ng_u_groups          = undef,
+$ng_user_shell        = '/bin/bash',
+
+# cgi settings
+$ng_context_help      = '1',
+$ng_pending_state     = '1',
+$ng_use_auth          = '1',
+$ng_use_ssl_auth      = '0',
+$ng_enable_def_user   = false,
+$ng_def_user_name     = 'nagios_insecure',
+$ng_nagios_admin      = 'nagios_sec_adm',
+$ng_sysinfo_auth      = '',
+$ng_confinfo_auth     = '',
+$ng_command_auth      = '',
+$ng_hostview_auth     = '',
+$ng_serviceview_auth  = '',
+$ng_host_cmd_auth     = '',
+$ng_svc_cmd_auth      = '',
+$ng_readonly_auth     = '' ,
+$ng_statusmap_img     = 'smbackground.gd2',
+$ng_use_colormap      = false,
+$ng_colormap_red      = '255',
+$ng_colormap_green    = '255',
+$ng_colormap_blue     = '255',
+$ng_statusmap_layout  = '6',
+$ng_wrl_layout        = '4',
+$ng_incl_own_wrl      = false,
+$ng_statuswrl_include = '',
+$ng_ping_syntax       = '/bin/ping -n -U -c 5 $HOSTADDRESS$',
+$ng_refresh_rate      = '90',
+$ng_result_limit      = '100',
+$ng_escape_html       = '1',
+$ng_use_sound         = false,
+$ng_host_unreachable  = 'hostdown.wav',
+$ng_host_down         = 'hostdown.wav',
+$ng_svc_critical      = 'critical.wav',
+$ng_svc_warn          = 'warning.wav',
+$ng_svc_unknown       = 'warning.wav',
+$ng_normal_sound      = 'noproblem.wav',
+$ng_action_url_target = '_blank',
+$ng_notes_url_target  = '_blank',
+$ng_lock_author_names = '1',
+$ng_enable_splunk     = false,
+$ng_splunk_url        = 'http://127.0.0.1:8000/',
+$ng_navbar_addresses  = '1',
+$ng_navbar_aliases    = '1',
+$ng_ack_no_sticky     = '0',
+$ng_ack_no_send       = '0',
+
+# selinux
+$ng_use_selinux_tools = true,
+
+) {
+
+# installation section
+
+  $reqpackages_server = $::operatingsystem ? {
+    /(?i-mx:centos|fedora|redhat)/ => ['nagios','nagios-devel']
+  }
+  $reqpackages_client = $::operatingsystem ? {
+    /(?i-mx:centos|fedora|redhat)/ => ['net-snmp-utils','nagios-plugins','nagios-plugins-all', 'nagios-plugins-nrpe', 'nagios-common']
+  }
+  $reqpackages_nrpe = $::operatingsystem ? {
+    /(?i-mx:centos|fedora|redhat)/ => ['nrpe']
+  }
+
+# service
+$ng_service       = 'nagios'
+
+# directories
+$ng_main_dir      = '/etc/nagios'
+$ng_conf_d_dir    = "${ng_main_dir}/conf.d"
+$ng_objects_dir   = "${ng_main_dir}/objects"
+$ng_private_dir   = "${ng_main_dir}/private"
+$ng_usr_incl      = '/usr/include/nagios'
+$ng_lib_dir       = '/usr/lib64/nagios'
+$ng_log_dir       = '/var/log/nagios'
+$ng_log_archives  = "${ng_log_dir}/archives"
+$ng_spool_dir     = '/var/spool/nagios'
+$ng_usr_share     = '/usr/share/nagios'
+$ng_share_html    = "${ng_usr_share}/html"
+
+# files
+$ng_main_config   = "${ng_main_dir}/nagios.cfg"
+$ng_cgi_cfg_file  = "${ng_main_dir}/cgi.cfg"
+$ng_cgi_cfg_erb   = 'cd_nagios/nagios/cgi_cfg.erb'
+$ng_htpasswd_file = "${ng_main_dir}/passwd"
+$ng_htpasswd_head = 'cd_nagios/nagios/htpasswd_head.erb'
+$ng_htpasswd_rule = 'cd_nagios/nagios/htpasswd_rule.erb'
+$ng_taccgi_erb    = 'cd_nagios/selinux/taccgi.erb'
+
+# includes must be last
+
+  include cd_nagios::main::config
+
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html new file mode 100644 index 0000000..bf69296 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -0,0 +1,199 @@ + + + + + + + Puppet Class: cd_nagios::selinux::config + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: cd_nagios::selinux::config

+
+ +
+
Inherits:
+
cd_nagios::params
+
+ + +
+
Defined in:
+
+ manifests/selinux/config.pp +
+
+
+ +

Summary

+ Class manages all aspects of configuring the module logic for +cd_nagios. + +

Overview

+
+
+ +

cd_nagios::selinux::config.pp +Module name: cd_nagios +Author: Arne Teuke +(arne_teuke@ConfDroid.com)

+ +

License:

+ +

This file is part of cd_nagios.

+ +

cd_nagios is used for providing automatic configuration of Nagios + +Copyright (C) 2016 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
+43
+44
+45
+46
+47
+ 		+ 
# File 'manifests/selinux/config.pp', line 24
+
+class cd_nagios::selinux::config (
+
+) inherits cd_nagios::params {
+
+  if $ng_use_selinux_tools == true {
+
+    # sealert 093d6a07-03f5-4457-abaa-e6592fb01e05
+    exec { 'create_policy_taccgi':
+      command     =>  template($ng_taccgi_erb),
+      path        =>  ['/usr/bin','/usr/sbin'],
+      cwd         =>  '/tmp',
+      creates     =>  '/tmp/my-taccgi',
+      notify      =>  Exec['semodule_taccgi'],
+    }
+
+    exec { 'semodule_taccgi':
+      command     =>  'semodule -i my-taccgi.pp',
+      path        =>  ['/usr/bin','/usr/sbin'],
+      cwd         =>  '/tmp',
+      require     =>  Exec['create_policy_taccgi'],
+      refreshonly => true,
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html new file mode 100644 index 0000000..420585a --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -0,0 +1,215 @@ + + + + + + + Puppet Class: cd_nagios::server::access_rules + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: cd_nagios::server::access_rules

+
+ +
+
Inherits:
+
cd_nagios::params
+
+ + +
+
Defined in:
+
+ manifests/server/access_rules.pp +
+
+
+ +

Summary

+ Class manages presennce of /etc/nagios/phtpasswd file. + +

Overview

+
+
+ +

cd_nagios::server::access_rules.pp +Module name: cd_nagios +Author: Arne +Teuke (arne_teuke@ConfDroid.com)

+ +

License:

+ +

This file is part of cd_nagios.

+ +

cd_nagios is used for providing automatic configuration of Nagios + +Copyright (C) 2016 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/.

+ +
+
+
+ +
+

Examples:

+ + + 
cd_nagios::server::access { 'example':
+  ng_htpasswd_user      => 'example_user',
+  ng_htpasswd_password  =>  'example_password_encrypted',
+}
+ +
+ + +
+ + + + + +
+ 
+
+
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+ 		+ 
# File 'manifests/server/access_rules.pp', line 28
+
+class cd_nagios::server::access_rules (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    # manage /etc/nagios/htpasswd file
+
+    concat { $ng_htpasswd_file:
+      ensure    =>  present,
+      path      =>  $ng_htpasswd_file,
+      owner     =>  'root',
+      group     =>  'apache',
+      mode      =>  '0640',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+    }
+
+    concat::fragment { 'create_header':
+      target    =>  $ng_htpasswd_file,
+      content   =>  template($ng_htpasswd_head),
+      notify    =>  Service[$ng_service],
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html new file mode 100644 index 0000000..c02ed79 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -0,0 +1,206 @@ + + + + + + + Puppet Class: cd_nagios::server::files + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: cd_nagios::server::files

+
+ +
+
Inherits:
+
cd_nagios::params
+
+ + +
+
Defined in:
+
+ manifests/server/files.pp +
+
+
+ +

Summary

+ Class manages all configuration files required for cd_nagios. + +

Overview

+
+
+ +

cd_nagios::server::files.pp +Module name: cd_nagios +Author: Arne Teuke +(arne_teuke@ConfDroid.com)

+ +

License:

+ +

This file is part of cd_nagios.

+ +

cd_nagios is used for providing automatic configuration of Nagios + +Copyright (C) 2016 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/.

+ +
+
+
+ + +
+ + + + + +
+ 
+
+
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+ 		+ 
# File 'manifests/server/files.pp', line 23
+
+class cd_nagios::server::files (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+  require cd_nagios::main::dirs
+
+    # manage nagios.cfg
+
+
+    # manage cgi.cfg
+
+    file { $ng_cgi_cfg_file:
+      ensure    =>  file,
+      path      =>  $ng_cgi_cfg_file,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+      content   =>  template($ng_cgi_cfg_erb),
+      notify    =>  Service[$ng_service],
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html new file mode 100644 index 0000000..94c88ce --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -0,0 +1,184 @@ + + + + + + + Puppet Class: cd_nagios::server::service + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: cd_nagios::server::service

+
+ +
+
Inherits:
+
cd_nagios::params
+
+ + +
+
Defined in:
+
+ manifests/server/service.pp +
+
+
+ +

Summary

+ Class manages the service(s) for cd_nagios. + +

Overview

+
+
+ +

cd_nagios::server::service.pp +Module name: cd_nagios +Author: Arne Teuke +(arne_teuke@ConfDroid.com)

+ +

License:

+ +

This file is part of cd_nagios.

+ +

cd_nagios is used for providing automatic configuration of Nagios + +Copyright (C) 2016 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/.

+ +
+
+
+ + +
+ + + + + +
+ 
+
+
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+ 		+ 
# File 'manifests/server/service.pp', line 23
+
+class cd_nagios::server::service (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    require cd_nagios::server::files
+    require cd_nagios::server::access_rules
+
+    service { $ng_service:
+      ensure      => running,
+      hasstatus   => true,
+      hasrestart  => true,
+      enable      => true,
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_defined_type_list.html b/doc/puppet_defined_type_list.html new file mode 100644 index 0000000..1a1b62b --- /dev/null +++ b/doc/puppet_defined_type_list.html @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + Defined Type List + + + +
+
+

Defined Type List

+ + + +
+ + +
+ + diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html new file mode 100644 index 0000000..38774d9 --- /dev/null +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -0,0 +1,211 @@ + + + + + + + Defined Type: cd_nagios::server::access + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Defined Type: cd_nagios::server::access

+
+
+
Defined in:
+
+ manifests/server/access.pp +
+
+
+ +

Summary

+ Define manages user- and password rules for accessing nagios. + +

Overview

+
+
+ +

cd_nagios::server::access.pp +Module name: cd_nagios +Author: Arne Teuke +(arne_teuke@ConfDroid.com)

+ +

License:

+ +

This file is part of cd_nagios.

+ +

cd_nagios is used for providing automatic configuration of Nagios + +Copyright (C) 2016 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/.

+ +
+
+
+

Parameters:

+
    + +
  • + + ng_htpasswd_user + + + (Any) + + + (defaults to: undef) + + +
    • + +
  • + + ng_htpasswd_password + + + (Any) + + + (defaults to: undef) + + +
    • + +
+ + +
+ + + + + +
+ 
+
+
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+ 		+ 
# File 'manifests/server/access.pp', line 23
+
+define cd_nagios::server::access (
+
+$ng_htpasswd_user     = undef,
+$ng_htpasswd_password = undef,
+
+) {
+
+$ng_htpasswd_file = $::cd_nagios::params::ng_htpasswd_file
+$ng_htpasswd_rule = $::cd_nagios::params::ng_htpasswd_rule
+$ng_service       = $::cd_nagios::params::ng_service
+
+  # create password rules
+
+  concat::fragment { $name:
+    target  =>  $ng_htpasswd_file,
+    content =>  template($ng_htpasswd_rule),
+    notify  =>  Service[$ng_service],
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html new file mode 100644 index 0000000..3378389 --- /dev/null +++ b/doc/top-level-namespace.html @@ -0,0 +1,100 @@ + + + + + + + Top Level Namespace + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Top Level Namespace + + + +

+
+ + + + + + + + + + + +
+ + + + + + + + + + +
+ + + +
+ + \ No newline at end of file diff --git a/tests/UTF_Files b/tests/UTF_Files new file mode 100644 index 0000000..7ac547d --- /dev/null +++ b/tests/UTF_Files @@ -0,0 +1,7 @@ +./.yardoc/object_types: data +./.yardoc/proxy_types: Applesoft BASIC program data +./.yardoc/complete: empty +./.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 +./templates/nagios/htpasswd_head.erb: empty From 030e5f68f509f71326099b15f47a38d319e13189 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 20 Jul 2017 16:11:13 +0200 Subject: [PATCH 02/26] recommit for updates in build 3 --- CHANGELOG.md | 9 ++++- REPOSTRUCTURE.md | 38 ++++++++++++++++++- doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 4 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 6 ++- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 6 +-- doc/top-level-namespace.html | 2 +- 18 files changed, 64 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1de8e3f..484674c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,14 @@ Changelog of Git Changelog.

No issue

-8db8758970310bf Arne Teuke 2017-07-20 13:31:19 +3a3e3ceef9a4a2f Jenkins Server 2017-07-20 13:47:46

-

recommitting to see if git can be fixed

+

recommit for updates in build 2

+ +

+febc8f1a348f2e7 Arne Teuke 2017-07-20 13:47:24 +

+

re-added all files

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 12e4ae8..89b1b11 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -1,4 +1,34 @@ . +|-- doc +| |-- css +| | |-- common.css +| | |-- full_list.css +| | `-- style.css +| |-- js +| | |-- app.js +| | |-- full_list.js +| | `-- jquery.js +| |-- puppet_classes +| | |-- cd_nagios_3A_3Afirewall_3A_3Aiptables.html +| | |-- cd_nagios_3A_3Amain_3A_3Aconfig.html +| | |-- cd_nagios_3A_3Amain_3A_3Adirs.html +| | |-- cd_nagios_3A_3Amain_3A_3Ainstall.html +| | |-- cd_nagios_3A_3Amain_3A_3Auser.html +| | |-- cd_nagios_3A_3Aparams.html +| | |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html +| | |-- cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +| | |-- cd_nagios_3A_3Aserver_3A_3Afiles.html +| | |-- cd_nagios_3A_3Aserver_3A_3Aservice.html +| | `-- cd_nagios.html +| |-- puppet_defined_types +| | `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html +| |-- file.README.html +| |-- frames.html +| |-- _index.html +| |-- index.html +| |-- puppet_class_list.html +| |-- puppet_defined_type_list.html +| `-- top-level-namespace.html |-- manifests | |-- client | | `-- target.pp @@ -25,10 +55,14 @@ | | `-- htpasswd_rule.erb | `-- selinux | `-- taccgi.erb +|-- tests +| `-- UTF_Files +|-- CHANGELOG.md |-- Gemfile |-- Gemfile.lock |-- Jenkinsfile |-- LICENSE -`-- README.md +|-- README.md +`-- REPOSTRUCTURE.md -9 directories, 22 files +15 directories, 50 files diff --git a/doc/_index.html b/doc/_index.html index af1095e..e9b86ae 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -176,7 +176,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index ea1a390..9421163 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index f744c74..4e7d075 100644 --- a/doc/index.html +++ b/doc/index.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index dc07105..beb715e 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index ac65ab4..e34cbe0 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index 723a1f0..53d6f00 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -187,7 +187,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index 5790533..f839d0c 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 0e64841..a8fdf25 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index a79da72..488947e 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 3722574..d4e9cf2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -2135,7 +2135,7 @@ $ng_taccgi_erb = 'cd_nagios/selinux/taccgi.erb' diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index bf69296..ca45ae8 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -169,7 +169,7 @@ class cd_nagios::selinux::config ( command => template($ng_taccgi_erb), path => ['/usr/bin','/usr/sbin'], cwd => '/tmp', - creates => '/tmp/my-taccgi', + creates => '/tmp/my-taccgi.pp', notify => Exec['semodule_taccgi'], } @@ -189,7 +189,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index 420585a..65004dc 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -166,7 +166,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

51 52 53 -54 +54 +55 
# File 'manifests/server/access_rules.pp', line 28
@@ -189,6 +190,7 @@ class cd_nagios::server::access_rules (
       selrole   =>  object_r,
       seltype   =>  nagios_etc_t,
       seluser   =>  system_u,
+      notify    =>  Service[$ng_service],
     }
 
     concat::fragment { 'create_header':
@@ -205,7 +207,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index c02ed79..4bfb3fd 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -196,7 +196,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 94c88ce..f4568cc 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 38774d9..f052efb 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -169,8 +169,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

 37
 38
 39
-40
-41
+40 
# File 'manifests/server/access.pp', line 23
@@ -191,7 +190,6 @@ $ng_service       = $::cd_nagios::params::ng_service
   concat::fragment { $name:
     target  =>  $ng_htpasswd_file,
     content =>  template($ng_htpasswd_rule),
-    notify  =>  Service[$ng_service],
   }
 }
@@ -201,7 +199,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index 3378389..ccada17 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 84a42a16a33cd80d69d46221f097ff52c3f26ff5 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 20 Jul 2017 16:46:15 +0200 Subject: [PATCH 03/26] recommit for updates in build 4 --- CHANGELOG.md | 15 +++++++++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 22 ++++++++++++++----- doc/top-level-namespace.html | 2 +- 17 files changed, 46 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 484674c..d7f351f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

No issue

+030e5f68f509f71 Jenkins Server 2017-07-20 14:11:13 +

+

recommit for updates in build 3

+ +

+8a14684ca214be5 Arne Teuke 2017-07-20 14:10:54 +

+

changed creates rule for exec

+ +

+cb2010e7d20dcc6 Arne Teuke 2017-07-20 14:09:11 +

+

moved service dependency to access_rules

+ +

3a3e3ceef9a4a2f Jenkins Server 2017-07-20 13:47:46

recommit for updates in build 2

diff --git a/doc/_index.html b/doc/_index.html index e9b86ae..29129a0 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -176,7 +176,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 9421163..28527bf 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 4e7d075..609f6cf 100644 --- a/doc/index.html +++ b/doc/index.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index beb715e..fee5196 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index e34cbe0..36840d8 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index 53d6f00..421fbc2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -187,7 +187,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index f839d0c..050d1a4 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index a8fdf25..65d0fd9 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 488947e..da0ddf3 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index d4e9cf2..2a7d453 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -2135,7 +2135,7 @@ $ng_taccgi_erb = 'cd_nagios/selinux/taccgi.erb' diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index ca45ae8..3686949 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -189,7 +189,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index 65004dc..a21999a 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -207,7 +207,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index 4bfb3fd..0add6cd 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -196,7 +196,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index f4568cc..30ef896 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -174,7 +174,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index f052efb..2997627 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -169,7 +169,12 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

37 38 39 -40 +40 +41 +42 +43 +44 +45 
# File 'manifests/server/access.pp', line 23
@@ -181,15 +186,20 @@ $ng_htpasswd_password = undef,
 
 ) {
 
+$ng_nagios_server = $::cd_nagios::params::ng_nagios_server
 $ng_htpasswd_file = $::cd_nagios::params::ng_htpasswd_file
 $ng_htpasswd_rule = $::cd_nagios::params::ng_htpasswd_rule
 $ng_service       = $::cd_nagios::params::ng_service
 
-  # create password rules
 
-  concat::fragment { $name:
-    target  =>  $ng_htpasswd_file,
-    content =>  template($ng_htpasswd_rule),
+  if $::fqdn == $ng_nagios_server {
+
+    # create password rules
+
+    concat::fragment { $name:
+      target  =>  $ng_htpasswd_file,
+      content =>  template($ng_htpasswd_rule),
+    }
   }
 }
@@ -199,7 +209,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index ccada17..c9dd615 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 016ec1e6dbe77ac8ad967a4d41e6f2a195562821 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 20 Jul 2017 17:17:24 +0200 Subject: [PATCH 04/26] recommit for updates in build 8 --- CHANGELOG.md | 10 +++++ REPOSTRUCTURE.md | 3 +- doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 6 ++- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 42 +++++++++++++++++-- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 18 files changed, 69 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7f351f..cd3a9a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+84a42a16a33cd80 Jenkins Server 2017-07-20 14:46:15 +

+

recommit for updates in build 4

+ +

+4c9cff0e73d216c Arne Teuke 2017-07-20 14:45:54 +

+

added check for nagios_server to access

+ +

030e5f68f509f71 Jenkins Server 2017-07-20 14:11:13

recommit for updates in build 3

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 89b1b11..a608adb 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -54,6 +54,7 @@ | | |-- htpasswd_head.erb | | `-- htpasswd_rule.erb | `-- selinux +| |-- statuscgi.erb | `-- taccgi.erb |-- tests | `-- UTF_Files @@ -65,4 +66,4 @@ |-- README.md `-- REPOSTRUCTURE.md -15 directories, 50 files +15 directories, 51 files diff --git a/doc/_index.html b/doc/_index.html index 29129a0..ff3df04 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -176,7 +176,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 28527bf..ae7462f 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 609f6cf..a5c3e26 100644 --- a/doc/index.html +++ b/doc/index.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index fee5196..af68945 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index 36840d8..c3a3efd 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index 421fbc2..016771f 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -187,7 +187,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index 050d1a4..df389e2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 65d0fd9..d1ce1b6 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index da0ddf3..272c0e7 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 2a7d453..5782712 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -1973,7 +1973,8 @@ enabled.

344 345 346 -347 +347 +348 
# File 'manifests/params.pp', line 198
@@ -2122,6 +2123,7 @@ $ng_htpasswd_file = "${ng_main_dir}/passwd"
 $ng_htpasswd_head = 'cd_nagios/nagios/htpasswd_head.erb'
 $ng_htpasswd_rule = 'cd_nagios/nagios/htpasswd_rule.erb'
 $ng_taccgi_erb    = 'cd_nagios/selinux/taccgi.erb'
+$ng_statcgi_erb   = 'cd_nagios/selinux/statuscgi.erb'
 
 # includes must be last
 
@@ -2135,7 +2137,7 @@ $ng_taccgi_erb    = 'cd_nagios/selinux/taccgi.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 3686949..a49032e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -153,7 +153,25 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

 44
 45
 46
-47
+47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 
# File 'manifests/selinux/config.pp', line 24
@@ -164,7 +182,7 @@ class cd_nagios::selinux::config (
 
   if $ng_use_selinux_tools == true {
 
-    # sealert 093d6a07-03f5-4457-abaa-e6592fb01e05
+    # sealert tac-cgi
     exec { 'create_policy_taccgi':
       command     =>  template($ng_taccgi_erb),
       path        =>  ['/usr/bin','/usr/sbin'],
@@ -180,6 +198,24 @@ class cd_nagios::selinux::config (
       require     =>  Exec['create_policy_taccgi'],
       refreshonly => true,
     }
+
+    # sealert status.cgi
+
+    exec { 'create_policy_statuscgi':
+      command     =>  template($ng_statcgi_erb),
+      path        =>  ['/usr/bin','/usr/sbin'],
+      cwd         =>  '/tmp',
+      creates     =>  '/tmp/my-statuscgi.pp',
+      notify      =>  Exec['semodule_taccgi'],
+    }
+
+    exec { 'semodule_statuscgi':
+      command     =>  'semodule -i my-statuscgi.pp',
+      path        =>  ['/usr/bin','/usr/sbin'],
+      cwd         =>  '/tmp',
+      require     =>  Exec['create_policy_statuscgi'],
+      refreshonly => true,
+    }
   }
 }
@@ -189,7 +225,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index a21999a..df68ae4 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -207,7 +207,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index 0add6cd..58d11ef 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -196,7 +196,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index 30ef896..543dae7 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -174,7 +174,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index 2997627..d95895c 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -209,7 +209,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index c9dd615..257cc45 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 33ed2fc013f9abd2509ff74eb1d131617d54b5ee Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 20 Jul 2017 18:15:02 +0200 Subject: [PATCH 05/26] recommit for updates in build 10 --- CHANGELOG.md | 25 ++++++++++++ REPOSTRUCTURE.md | 3 +- doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 38 +++++++++++++++---- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 16 +------- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- tests/UTF_Files | 1 - 19 files changed, 73 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd3a9a9..ce06939 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,31 @@ Changelog of Git Changelog.

No issue

+016ec1e6dbe77ac Jenkins Server 2017-07-20 15:17:24 +

+

recommit for updates in build 8

+ +

+508e672c317a2b8 Arne Teuke 2017-07-20 15:16:51 +

+

added statuscgi_pol to template

+ +

+8d204947db73672 Arne Teuke 2017-07-20 15:15:51 +

+

added statuscgi_pol

+ +

+aefb0a83a611a13 Arne Teuke 2017-07-20 14:55:30 +

+

undoing array

+ +

+00267d122ba29c2 Arne Teuke 2017-07-20 14:54:56 +

+

testing array

+ +

84a42a16a33cd80 Jenkins Server 2017-07-20 14:46:15

recommit for updates in build 4

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index a608adb..4b114a2 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -51,7 +51,6 @@ |-- templates | |-- nagios | | |-- cgi_cfg.erb -| | |-- htpasswd_head.erb | | `-- htpasswd_rule.erb | `-- selinux | |-- statuscgi.erb @@ -66,4 +65,4 @@ |-- README.md `-- REPOSTRUCTURE.md -15 directories, 51 files +15 directories, 50 files diff --git a/doc/_index.html b/doc/_index.html index ff3df04..5acb51f 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -176,7 +176,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index ae7462f..850c8a2 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index a5c3e26..4ae18bc 100644 --- a/doc/index.html +++ b/doc/index.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index af68945..97d2155 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index c3a3efd..187a164 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index 016771f..a6de126 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -187,7 +187,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index df389e2..f3d6abf 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index d1ce1b6..52ba7ec 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 272c0e7..9e0ba14 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 5782712..ebb6a78 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -2137,7 +2137,7 @@ $ng_statcgi_erb = 'cd_nagios/selinux/statuscgi.erb' diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index a49032e..3b7a85d 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -171,7 +171,19 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

62 63 64 -65 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 
# File 'manifests/selinux/config.pp', line 24
@@ -182,11 +194,22 @@ class cd_nagios::selinux::config (
 
   if $ng_use_selinux_tools == true {
 
-    # sealert tac-cgi
+  # it appears that selinux hehaves differently accross different nodes,
+  # so all we can do for now is to create a list of the AVC alerts and come up
+  # with a solution on that later.
+
+    exec { 'create_avc_list':
+      command     =>  'sealert -a /var/log/audit/audit.log > avc_alerts',
+      cwd         =>  $ng_user_home,
+      path        =>  ['/usr/bin'],
+      creates     =>  "${ng_user_home}/avc_alerts",
+    }
+
+   # sealert tac-cgi
     exec { 'create_policy_taccgi':
       command     =>  template($ng_taccgi_erb),
       path        =>  ['/usr/bin','/usr/sbin'],
-      cwd         =>  '/tmp',
+      cwd         =>  $ng_user_home,
       creates     =>  '/tmp/my-taccgi.pp',
       notify      =>  Exec['semodule_taccgi'],
     }
@@ -194,7 +217,7 @@ class cd_nagios::selinux::config (
     exec { 'semodule_taccgi':
       command     =>  'semodule -i my-taccgi.pp',
       path        =>  ['/usr/bin','/usr/sbin'],
-      cwd         =>  '/tmp',
+      cwd         =>  $ng_user_home,
       require     =>  Exec['create_policy_taccgi'],
       refreshonly => true,
     }
@@ -204,7 +227,7 @@ class cd_nagios::selinux::config (
     exec { 'create_policy_statuscgi':
       command     =>  template($ng_statcgi_erb),
       path        =>  ['/usr/bin','/usr/sbin'],
-      cwd         =>  '/tmp',
+      cwd         =>  $ng_user_home,
       creates     =>  '/tmp/my-statuscgi.pp',
       notify      =>  Exec['semodule_taccgi'],
     }
@@ -212,10 +235,11 @@ class cd_nagios::selinux::config (
     exec { 'semodule_statuscgi':
       command     =>  'semodule -i my-statuscgi.pp',
       path        =>  ['/usr/bin','/usr/sbin'],
-      cwd         =>  '/tmp',
+      cwd         =>  $ng_user_home,
       require     =>  Exec['create_policy_statuscgi'],
       refreshonly => true,
     }
+
   }
 }
@@ -225,7 +249,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index df68ae4..abd7b1e 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -161,13 +161,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

46 47 48 -49 -50 -51 -52 -53 -54 -55 +49 
# File 'manifests/server/access_rules.pp', line 28
@@ -192,12 +186,6 @@ class cd_nagios::server::access_rules (
       seluser   =>  system_u,
       notify    =>  Service[$ng_service],
     }
-
-    concat::fragment { 'create_header':
-      target    =>  $ng_htpasswd_file,
-      content   =>  template($ng_htpasswd_head),
-      notify    =>  Service[$ng_service],
-    }
   }
 }
@@ -207,7 +195,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index 58d11ef..f8856b5 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -196,7 +196,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index 543dae7..07efede 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -174,7 +174,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index d95895c..57ef2c7 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -209,7 +209,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index 257cc45..67249af 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ diff --git a/tests/UTF_Files b/tests/UTF_Files index 7ac547d..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 -./templates/nagios/htpasswd_head.erb: empty From 2d7dc8a5c57ed98a704e42da4be59860dbfd1c46 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 20 Jul 2017 18:21:27 +0200 Subject: [PATCH 06/26] recommit for updates in build 11 --- CHANGELOG.md | 15 +++++++++++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 12 +++++------- .../cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 17 files changed, 35 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce06939..8385b95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

No issue

+33ed2fc013f9abd Jenkins Server 2017-07-20 16:15:02 +

+

recommit for updates in build 10

+ +

+a33a855948f5050 Arne Teuke 2017-07-20 16:14:42 +

+

trying to work my way again through selinux

+ +

+0f4d8b1a85a59cb Arne Teuke 2017-07-20 16:12:18 +

+

trying to work my way again through selinux

+ +

016ec1e6dbe77ac Jenkins Server 2017-07-20 15:17:24

recommit for updates in build 8

diff --git a/doc/_index.html b/doc/_index.html index 5acb51f..6d545df 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -176,7 +176,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 850c8a2..ace24aa 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 4ae18bc..c62e881 100644 --- a/doc/index.html +++ b/doc/index.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 97d2155..5a3fda8 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index 187a164..b727ab9 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index a6de126..cdf567f 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -187,7 +187,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index f3d6abf..20937b4 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 52ba7ec..7df521a 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 9e0ba14..559f02e 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index ebb6a78..0a835bc 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -2137,7 +2137,7 @@ $ng_statcgi_erb = 'cd_nagios/selinux/statuscgi.erb' diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index 3b7a85d..55950de 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -182,8 +182,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

73 74 75 -76 -77 +76 
# File 'manifests/selinux/config.pp', line 24
@@ -205,12 +204,12 @@ class cd_nagios::selinux::config (
       creates     =>  "${ng_user_home}/avc_alerts",
     }
 
-   # sealert tac-cgi
+    # sealert tac-cgi
     exec { 'create_policy_taccgi':
       command     =>  template($ng_taccgi_erb),
       path        =>  ['/usr/bin','/usr/sbin'],
       cwd         =>  $ng_user_home,
-      creates     =>  '/tmp/my-taccgi.pp',
+      creates     =>  "${ng_user_home}/my-taccgi.pp",
       notify      =>  Exec['semodule_taccgi'],
     }
 
@@ -228,7 +227,7 @@ class cd_nagios::selinux::config (
       command     =>  template($ng_statcgi_erb),
       path        =>  ['/usr/bin','/usr/sbin'],
       cwd         =>  $ng_user_home,
-      creates     =>  '/tmp/my-statuscgi.pp',
+      creates     =>  "${ng_user_home}/my-statuscgi.pp",
       notify      =>  Exec['semodule_taccgi'],
     }
 
@@ -239,7 +238,6 @@ class cd_nagios::selinux::config (
       require     =>  Exec['create_policy_statuscgi'],
       refreshonly => true,
     }
-
   }
 }
@@ -249,7 +247,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index abd7b1e..3fdea54 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -195,7 +195,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index f8856b5..6b70d0d 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -196,7 +196,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index 07efede..6ac20ba 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -174,7 +174,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index 57ef2c7..4366035 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -209,7 +209,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index 67249af..09925ce 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 05036af241826015367544f9665e4f5f017e943c Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 20 Jul 2017 18:26:40 +0200 Subject: [PATCH 07/26] recommit for updates in build 12 --- CHANGELOG.md | 10 ++++++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 4 ++-- .../cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 17 files changed, 27 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8385b95..a1df4b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+2d7dc8a5c57ed98 Jenkins Server 2017-07-20 16:21:27 +

+

recommit for updates in build 11

+ +

+3252eaf33a90183 Arne Teuke 2017-07-20 16:21:09 +

+

trying to work my way again through selinux

+ +

33ed2fc013f9abd Jenkins Server 2017-07-20 16:15:02

recommit for updates in build 10

diff --git a/doc/_index.html b/doc/_index.html index 6d545df..af8b856 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -176,7 +176,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index ace24aa..5eaa169 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index c62e881..f7b51d8 100644 --- a/doc/index.html +++ b/doc/index.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 5a3fda8..65d2d88 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index b727ab9..9a04a35 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index cdf567f..8745172 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -187,7 +187,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index 20937b4..c57b167 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 7df521a..ecae3a3 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 559f02e..57220ca 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 0a835bc..7f654ed 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -2137,7 +2137,7 @@ $ng_statcgi_erb = 'cd_nagios/selinux/statuscgi.erb' diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index 55950de..8610ee7 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -228,7 +228,7 @@ class cd_nagios::selinux::config ( path => ['/usr/bin','/usr/sbin'], cwd => $ng_user_home, creates => "${ng_user_home}/my-statuscgi.pp", - notify => Exec['semodule_taccgi'], + notify => Exec['semodule_statuscgi'], } exec { 'semodule_statuscgi': @@ -247,7 +247,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index 3fdea54..adff29d 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -195,7 +195,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index 6b70d0d..8cd4a6e 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -196,7 +196,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index 6ac20ba..a863fa3 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -174,7 +174,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index 4366035..5d62b00 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -209,7 +209,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index 09925ce..2be2f8d 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 969e377d5db6423e8b2916e5976d48a0833ebd2e Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 21 Jul 2017 13:06:59 +0200 Subject: [PATCH 08/26] recommit for updates in build 15 --- CHANGELOG.md | 10 +++ REPOSTRUCTURE.md | 4 +- doc/_index.html | 2 +- doc/file.README.html | 4 +- doc/index.html | 4 +- doc/puppet_classes/cd_nagios.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 85 +++++++++++++------ .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 10 ++- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 36 +++++++- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 18 files changed, 127 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1df4b7..c56be5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+05036af24182601 Jenkins Server 2017-07-20 16:26:40 +

+

recommit for updates in build 12

+ +

+6e251a61a25bb1d Arne Teuke 2017-07-20 16:26:21 +

+

changed wrong refresh

+ +

2d7dc8a5c57ed98 Jenkins Server 2017-07-20 16:21:27

recommit for updates in build 11

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 4b114a2..1beb036 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -49,6 +49,8 @@ | |-- init.pp | `-- params.pp |-- templates +| |-- httpd +| | `-- nagios_conf.erb | |-- nagios | | |-- cgi_cfg.erb | | `-- htpasswd_rule.erb @@ -65,4 +67,4 @@ |-- README.md `-- REPOSTRUCTURE.md -15 directories, 50 files +16 directories, 51 files diff --git a/doc/_index.html b/doc/_index.html index af8b856..d2e63bd 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -176,7 +176,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 5eaa169..28d8d06 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -61,7 +61,7 @@

|Repo Name| version | Build Status| |---|---|---|---| -|cd_nagios| 0.0.0.6 | cd_nagios| 0.0.0.7 | {Build Status/]|

@@ -297,7 +297,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index f7b51d8..4908ecc 100644 --- a/doc/index.html +++ b/doc/index.html @@ -61,7 +61,7 @@

|Repo Name| version | Build Status| |---|---|---|---| -|cd_nagios| 0.0.0.6 | cd_nagios| 0.0.0.7 | {Build Status/]|

@@ -297,7 +297,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 65d2d88..f2de14a 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index 9a04a35..48a5e95 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index 8745172..099126e 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -187,7 +187,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index c57b167..ad0e190 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index ecae3a3..2ddc17a 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 57220ca..ca960dc 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 7f654ed..48f6f66 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -1803,6 +1803,27 @@ unchecked.

Whether to enable selinux tools and policies. only effective if selinux is enabled.

+ + + + +
  • + + ng_required_hosts + + + (array) + + + (defaults to: ['']) + + + — +
    +

    Array of FQDNs for hosts which should be +allowed/required. every entry in +the array creates a new line in the +configuration file.

    • @@ -1824,9 +1845,6 @@ enabled.

     
 
-198
-199
-200
 201
 202
 203
@@ -1974,10 +1992,19 @@ enabled.
    
 345
 346
 347
-348
    +348 +349 +350 +351 +352 +353 +354 +355 +356 +357 - 
    # File 'manifests/params.pp', line 198
+        
    # File 'manifests/params.pp', line 201
 
 class cd_nagios::params (
 
@@ -2085,6 +2112,9 @@ $ng_ack_no_send       = '0',
 # selinux
 $ng_use_selinux_tools = true,
 
+# httpd
+$ng_required_hosts    = [''],
+
 ) {
 
 # installation section
@@ -2100,30 +2130,33 @@ $ng_use_selinux_tools = true,
   }
 
 # service
-$ng_service       = 'nagios'
+$ng_service         = 'nagios'
+$ae_service         = 'httpd'
 
 # directories
-$ng_main_dir      = '/etc/nagios'
-$ng_conf_d_dir    = "${ng_main_dir}/conf.d"
-$ng_objects_dir   = "${ng_main_dir}/objects"
-$ng_private_dir   = "${ng_main_dir}/private"
-$ng_usr_incl      = '/usr/include/nagios'
-$ng_lib_dir       = '/usr/lib64/nagios'
-$ng_log_dir       = '/var/log/nagios'
-$ng_log_archives  = "${ng_log_dir}/archives"
-$ng_spool_dir     = '/var/spool/nagios'
-$ng_usr_share     = '/usr/share/nagios'
-$ng_share_html    = "${ng_usr_share}/html"
+$ng_main_dir        = '/etc/nagios'
+$ng_conf_d_dir      = "${ng_main_dir}/conf.d"
+$ng_objects_dir     = "${ng_main_dir}/objects"
+$ng_private_dir     = "${ng_main_dir}/private"
+$ng_usr_incl        = '/usr/include/nagios'
+$ng_lib_dir         = '/usr/lib64/nagios'
+$ng_log_dir         = '/var/log/nagios'
+$ng_log_archives    = "${ng_log_dir}/archives"
+$ng_spool_dir       = '/var/spool/nagios'
+$ng_usr_share       = '/usr/share/nagios'
+$ng_share_html      = "${ng_usr_share}/html"
 
 # files
-$ng_main_config   = "${ng_main_dir}/nagios.cfg"
-$ng_cgi_cfg_file  = "${ng_main_dir}/cgi.cfg"
-$ng_cgi_cfg_erb   = 'cd_nagios/nagios/cgi_cfg.erb'
-$ng_htpasswd_file = "${ng_main_dir}/passwd"
-$ng_htpasswd_head = 'cd_nagios/nagios/htpasswd_head.erb'
-$ng_htpasswd_rule = 'cd_nagios/nagios/htpasswd_rule.erb'
-$ng_taccgi_erb    = 'cd_nagios/selinux/taccgi.erb'
-$ng_statcgi_erb   = 'cd_nagios/selinux/statuscgi.erb'
+$ng_main_config     = "${ng_main_dir}/nagios.cfg"
+$ng_cgi_cfg_file    = "${ng_main_dir}/cgi.cfg"
+$ng_cgi_cfg_erb     = 'cd_nagios/nagios/cgi_cfg.erb'
+$ng_htpasswd_file   = "${ng_main_dir}/passwd"
+$ng_htpasswd_head   = 'cd_nagios/nagios/htpasswd_head.erb'
+$ng_htpasswd_rule   = 'cd_nagios/nagios/htpasswd_rule.erb'
+$ng_taccgi_erb      = 'cd_nagios/selinux/taccgi.erb'
+$ng_statcgi_erb     = 'cd_nagios/selinux/statuscgi.erb'
+$ng_nagios_conf     = '/etc/httpd/conf.d/nagios.conf'
+$ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb'
 
 # includes must be last
 
@@ -2137,7 +2170,7 @@ $ng_statcgi_erb   = 'cd_nagios/selinux/statuscgi.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 8610ee7..9a1c57a 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -182,7 +182,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 73
 74
 75
-76
    
+76
+77
    # File 'manifests/selinux/config.pp', line 24
@@ -218,7 +219,7 @@ class cd_nagios::selinux::config (
       path        =>  ['/usr/bin','/usr/sbin'],
       cwd         =>  $ng_user_home,
       require     =>  Exec['create_policy_taccgi'],
-      refreshonly => true,
+      refreshonly =>  true,
     }
 
     # sealert status.cgi
@@ -236,7 +237,8 @@ class cd_nagios::selinux::config (
       path        =>  ['/usr/bin','/usr/sbin'],
       cwd         =>  $ng_user_home,
       require     =>  Exec['create_policy_statuscgi'],
-      refreshonly => true,
+      refreshonly =>  true,
+      notify      =>  Service[$ng_service],
     }
   }
 }
    @@ -247,7 +249,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index adff29d..a8c85c1 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -195,7 +195,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index 8cd4a6e..2298ca2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -156,7 +156,23 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    47 48 49 -50 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 
    # File 'manifests/server/files.pp', line 23
@@ -187,6 +203,22 @@ class cd_nagios::server::files (
       content   =>  template($ng_cgi_cfg_erb),
       notify    =>  Service[$ng_service],
     }
+
+    # manage nagios.conf for httpd
+
+    file { $ng_nagios_conf:
+      ensure    =>  file,
+      path      =>  $ng_nagios_conf,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  httpd_config_t,
+      seluser   =>  system_u,
+      content   =>  template($ng_nagios_conf_erb),
+      notify    =>  Service[$ae_service],
+    }
   }
 }
    @@ -196,7 +228,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index a863fa3..479b7a6 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -174,7 +174,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index 5d62b00..ca1b1b1 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -209,7 +209,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index 2be2f8d..807736a 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 109eea2716be3ae9088dfdffe3ab8f8902255b44 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 21 Jul 2017 13:35:04 +0200 Subject: [PATCH 09/26] recommit for updates in build 18 --- CHANGELOG.md | 85 ++-- doc/_index.html | 7 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_class_list.html | 27 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 378 ++++++++++++++++++ ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 50 ++- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 27 +- doc/top-level-namespace.html | 2 +- 19 files changed, 528 insertions(+), 72 deletions(-) create mode 100644 doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html diff --git a/CHANGELOG.md b/CHANGELOG.md index c56be5e..8c376dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,30 +8,75 @@ Changelog of Git Changelog.

    No issue

    +969e377d5db6423 Jenkins Server 2017-07-21 11:06:59 +

    +

    recommit for updates in build 15

    + +

    +e402224ff9bb367 Arne Teuke 2017-07-21 11:06:36 +

    +

    trying empty array

    + +

    +49551a3d9af3460 Arne Teuke 2017-07-21 10:43:06 +

    +

    included control for nagios.conf

    + +

    05036af24182601 Jenkins Server 2017-07-20 16:26:40

    recommit for updates in build 12

    -

    -6e251a61a25bb1d Arne Teuke 2017-07-20 16:26:21 -

    -

    changed wrong refresh

    -

    2d7dc8a5c57ed98 Jenkins Server 2017-07-20 16:21:27

    recommit for updates in build 11

    -

    -3252eaf33a90183 Arne Teuke 2017-07-20 16:21:09 -

    -

    trying to work my way again through selinux

    -

    33ed2fc013f9abd Jenkins Server 2017-07-20 16:15:02

    recommit for updates in build 10

    +

    +016ec1e6dbe77ac Jenkins Server 2017-07-20 15:17:24 +

    +

    recommit for updates in build 8

    + +

    +84a42a16a33cd80 Jenkins Server 2017-07-20 14:46:15 +

    +

    recommit for updates in build 4

    + +

    +030e5f68f509f71 Jenkins Server 2017-07-20 14:11:13 +

    +

    recommit for updates in build 3

    + +

    +3a3e3ceef9a4a2f Jenkins Server 2017-07-20 13:47:46 +

    +

    recommit for updates in build 2

    + +

    + +

    v0.0.0.7

    +

    No issue

    + + +5fcf6031faa6aab Arne Teuke 2017-07-20 16:30:38 +

    +

    updated README

    + +

    +6e251a61a25bb1d Arne Teuke 2017-07-20 16:26:21 +

    +

    changed wrong refresh

    + +

    +3252eaf33a90183 Arne Teuke 2017-07-20 16:21:09 +

    +

    trying to work my way again through selinux

    +

    a33a855948f5050 Arne Teuke 2017-07-20 16:14:42

    @@ -42,11 +87,6 @@ Changelog of Git Changelog.

    trying to work my way again through selinux

    -

    -016ec1e6dbe77ac Jenkins Server 2017-07-20 15:17:24 -

    -

    recommit for updates in build 8

    -

    508e672c317a2b8 Arne Teuke 2017-07-20 15:16:51

    @@ -67,21 +107,11 @@ Changelog of Git Changelog.

    testing array

    -

    -84a42a16a33cd80 Jenkins Server 2017-07-20 14:46:15 -

    -

    recommit for updates in build 4

    -

    4c9cff0e73d216c Arne Teuke 2017-07-20 14:45:54

    added check for nagios_server to access

    -

    -030e5f68f509f71 Jenkins Server 2017-07-20 14:11:13 -

    -

    recommit for updates in build 3

    -

    8a14684ca214be5 Arne Teuke 2017-07-20 14:10:54

    @@ -92,11 +122,6 @@ Changelog of Git Changelog.

    moved service dependency to access_rules

    -

    -3a3e3ceef9a4a2f Jenkins Server 2017-07-20 13:47:46 -

    -

    recommit for updates in build 2

    -

    febc8f1a348f2e7 Arne Teuke 2017-07-20 13:47:24

    diff --git a/doc/_index.html b/doc/_index.html index d2e63bd..4660179 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -73,6 +73,11 @@ +

  • + cd_nagios::client::target + +
    • +
  • cd_nagios::firewall::iptables @@ -176,7 +181,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 28d8d06..9ac4d07 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -297,7 +297,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 4908ecc..84f0416 100644 --- a/doc/index.html +++ b/doc/index.html @@ -297,7 +297,7 @@ environments.

    diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index ed0adf4..d7b54ba 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -47,70 +47,77 @@
    • -
  • +
  • +
    + cd_nagios::client::target +
    +
    • + + +
  • cd_nagios::firewall::iptables
    • -
  • +
  • cd_nagios::main::config
    • -
  • +
  • cd_nagios::main::dirs
    • -
  • +
  • cd_nagios::main::install
    • -
  • +
  • cd_nagios::main::user
    • -
  • +
  • cd_nagios::params
    • -
  • +
  • cd_nagios::selinux::config
    • -
  • +
  • cd_nagios::server::access_rules
    • -
  • +
  • cd_nagios::server::files
    • -
  • +
  • cd_nagios::server::service
    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index f2de14a..75bbcf5 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html new file mode 100644 index 0000000..c0a9e56 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -0,0 +1,378 @@ + + + + + + + Puppet Class: cd_nagios::client::target + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: cd_nagios::client::target

    +
    + +
    +
    Inherits:
    +
    cd_nagios::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/client/target.pp +
    +
    +
    + +

    Summary

    + CLass manages Nagios targets for cd_nagios. + +

    Overview

    +
    +
    + +

    cd_nagios::client::target.pp +Module name: nagios +Author: Arne Teuke +(arne_teuke@ConfDroid.com) +License: + This file is part of nagios.

    + +

    nagios is used for providing automatic configuration of Nagios targets. + +Copyright (C) 2016 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/.

    + +
    +
    +
    + + +
    + + + + + +
    + 
    +
+
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
    +     		+ 
    # File 'manifests/client/target.pp', line 23
+
+class cd_nagios::client::target (
+
+
+) inherits cd_nagios::params {
+
+  if $::fqdn != $ng_nagios_server {
+
+    @@nagios_host { $::fqdn:
+        ensure              =>  $ng_ping_ensure,
+        alias               =>  $::hostname,
+        address             =>  $::fqdn,
+        use                 =>  'linux-server',
+        target              =>  $ng_target_host,
+        hostgroups          =>  'linux-servers',
+        contacts            =>  'ops',
+        max_check_attempts  =>  $max_check_attempts,
+        notification_period =>  '24x7',
+        owner               =>  'nagios',
+        group               =>  'nagios',
+        mode                =>  '0664',
+        check_command       =>  "check_ping!${ng_ping_warn}!${ng_ping_crit}",
+        notify              =>  Service['nagios'],
+    }
+
+    @@nagios_service { "root_partition_${::hostname}":
+        ensure              =>  $ng_disk_ensure,
+        check_command       =>  "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/",
+        use                 =>  'generic-service',
+        host_name           =>  $::fqdn,
+        contacts            =>  'ops',
+        notification_period =>  '24x7',
+        service_description =>  "${::hostname}_root_partition",
+        servicegroups       =>  'linux-services',
+        target              =>  $ng_target_service,
+        owner               =>  'nagios',
+        group               =>  'nagios',
+        mode                =>  '0664',
+    }
+
+    @@nagios_service { "Swap_Usage_${::hostname}":
+        ensure              =>  $ng_swap_ensure,
+        check_command       =>  "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}",
+        use                 =>  'generic-service',
+        host_name           =>  $::fqdn,
+        contacts            =>  'ops',
+        notification_period =>  '24x7',
+        service_description =>  "${::hostname}_swap_usage",
+        servicegroups       =>  'linux-services',
+        target              =>  $ng_target_service,
+        owner               =>  'nagios',
+        group               =>  'nagios',
+        mode                =>  '0664',
+    }
+
+    @@nagios_service { "Local_Users_${::hostname}":
+        ensure              =>  $ng_users_ensure,
+        check_command       =>  "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}",
+        use                 =>  'generic-service',
+        host_name           =>  $::fqdn,
+        contacts            =>  'ops',
+        notification_period =>  '24x7',
+        service_description =>  "${::hostname}_local_users",
+        servicegroups       =>  'linux-services',
+        target              =>  $ng_target_service,
+        owner               =>  'nagios',
+        group               =>  'nagios',
+        mode                =>  '0664',
+    }
+
+    @@nagios_service { "Total Processes_${::hostname}":
+        ensure              =>  $ng_procs_tot_ens,
+        check_command       =>  "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
+        use                 =>  'generic-service',
+        host_name           =>  $::fqdn,
+        contacts            =>  'ops',
+        notification_period =>  '24x7',
+        service_description =>  "${::hostname}_total_processes",
+        servicegroups       =>  'linux-services',
+        target              =>  $ng_target_service,
+        owner               =>  'nagios',
+        group               =>  'nagios',
+        mode                =>  '0664',
+    }
+
+    @@nagios_service { "Zombie Processes_${::hostname}":
+        ensure              =>  $ng_procs_z_ensure,
+        check_command       =>  "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}",
+        use                 =>  'generic-service',
+        host_name           =>  $::fqdn,
+        contacts            =>  'ops',
+        notification_period =>  '24x7',
+        service_description =>  "${::hostname}_zombie_processes",
+        servicegroups       =>  'linux-services',
+        target              =>  $ng_target_service,
+        owner               =>  'nagios',
+        group               =>  'nagios',
+        mode                =>  '0664',
+    }
+
+    @@nagios_service { "Current_Load_${::hostname}":
+        ensure              =>  $ng_load_ensure,
+        check_command       =>  "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}",
+        use                 =>  'generic-service',
+        host_name           =>  $::fqdn,
+        contacts            =>  'ops',
+        notification_period =>  '24x7',
+        service_description =>  "${::hostname}_current_load",
+        servicegroups       =>  'linux-services',
+        target              =>  $ng_target_service,
+        owner               =>  'nagios',
+        group               =>  'nagios',
+        mode                =>  '0664',
+    }
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index 48a5e95..13a7273 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index 099126e..1786747 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -187,7 +187,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index ad0e190..ee4b5ef 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 2ddc17a..2fe8f67 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index ca960dc..81cca77 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 48f6f66..fe1ded2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -77,6 +77,8 @@ cd_nagios::server::files
    + cd_nagios::client::target
    + cd_nagios::selinux::config
    cd_nagios::server::service
    @@ -1820,10 +1822,36 @@ enabled.

    —
    -

    Array of FQDNs for hosts which should be -allowed/required. every entry in -the array creates a new line in the -configuration file.

    +

    Array of FQDNs for hosts which +should be allowed/required. +every entry in the array creates a new line in +the configuration file.

    +
    + +
    • + +
  • + + ng_required_ips + + + (array) + + + (defaults to: ['127.0.0.0/8']) + + + — +
    +

    Array of <b>_<em>Ip addresses __** for hosts which +should be +allowed/reqired. every entry in the array creates a new line in +the +configuration fileIp addresses _</em></b> for hosts +which +should be allowed/reqired. every entry in the array creates a new +line in +the configuration file

    • @@ -1845,9 +1873,6 @@ configuration file.

     
 
-201
-202
-203
 204
 205
 206
@@ -2001,10 +2026,14 @@ configuration file.
    
 354
 355
 356
-357
    +357 +358 +359 +360 +361 - 
    # File 'manifests/params.pp', line 201
+        
    # File 'manifests/params.pp', line 204
 
 class cd_nagios::params (
 
@@ -2114,6 +2143,7 @@ $ng_use_selinux_tools = true,
 
 # httpd
 $ng_required_hosts    = [''],
+$ng_required_ips      = ['127.0.0.0/8'],
 
 ) {
 
@@ -2170,7 +2200,7 @@ $ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 9a1c57a..fb9a47e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index a8c85c1..f41565e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 2298ca2..1df61f4 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -228,7 +228,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 479b7a6..ada8a07 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index ca1b1b1..e3f13f8 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -121,12 +121,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
         ng_htpasswd_user
       
       
-        (Any)
+        (string)
       
       
         (defaults to: undef)
       
       
+        —
+        
    
+
    user name for the /etc/nagios/passwd file
    
+
    
+      
     
   
     
  • 
@@ -134,12 +139,18 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
         ng_htpasswd_password
       
       
-        (Any)
+        (string)
       
       
         (defaults to: undef)
       
       
+        —
+        
    
+
    the encrypted password for the
+/etc/nagios/passwd file.
    
+
    
+      
     
    • 
   
 
@@ -152,9 +163,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
         
     
 
-23
-24
-25
 26
 27
 28
@@ -174,10 +182,13 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 42
 43
 44
-45
    
+45
+46
+47
+48
    
       
       
-        
    # File 'manifests/server/access.pp', line 23
+        
    # File 'manifests/server/access.pp', line 26
 
 define cd_nagios::server::access (
 
@@ -209,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 807736a..b3b4867 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 4ec7633f976a2250108cb8eb81771d3f46b372e5 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Fri, 21 Jul 2017 14:51:33 +0200
Subject: [PATCH 10/26] recommit for updates in build 24

---
 CHANGELOG.md                                  | 20 +++++++++
 REPOSTRUCTURE.md                              |  3 +-
 doc/_index.html                               |  2 +-
 doc/file.README.html                          |  2 +-
 doc/index.html                                |  2 +-
 doc/puppet_classes/cd_nagios.html             |  2 +-
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |  2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html | 42 +++++++++----------
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |  2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |  2 +-
 doc/top-level-namespace.html                  |  2 +-
 19 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c376dc..d5eb6b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,26 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+109eea2716be3ae Jenkins Server 2017-07-21 11:35:04
+
    
+
    recommit for updates in build 18
    
+
+
    
+5de81e818498830 Arne Teuke 2017-07-21 11:34:48
+
    
+
    testing options both for hosts and ips
    
+
+
    
+41434c9607ab037 Arne Teuke 2017-07-21 11:28:50
+
    
+
    adding options both for hosts and ips
    
+
+
    
+544f48d800ad39a Arne Teuke 2017-07-21 11:21:12
+
    
+
    adding options both for hosts and ips
    
+
+
    
 969e377d5db6423 Jenkins Server 2017-07-21 11:06:59
 
    
 
    recommit for updates in build 15
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 1beb036..2b150b5 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -9,6 +9,7 @@
 |   |   |-- full_list.js
 |   |   `-- jquery.js
 |   |-- puppet_classes
+|   |   |-- cd_nagios_3A_3Aclient_3A_3Atarget.html
 |   |   |-- cd_nagios_3A_3Afirewall_3A_3Aiptables.html
 |   |   |-- cd_nagios_3A_3Amain_3A_3Aconfig.html
 |   |   |-- cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -67,4 +68,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-16 directories, 51 files
+16 directories, 52 files
diff --git a/doc/_index.html b/doc/_index.html
index 4660179..e6c2f23 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -181,7 +181,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 9ac4d07..d74e1e3 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -297,7 +297,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 84f0416..3b27837 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -297,7 +297,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index 75bbcf5..bfcbea5 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index c0a9e56..982637c 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 13a7273..cba9167 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index 1786747..be593a1 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index ee4b5ef..97786f3 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 2fe8f67..1880f6f 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 81cca77..ef0b2b6 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index fe1ded2..df0dd9e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -1814,18 +1814,19 @@ enabled.
    
         ng_required_hosts
       
       
-        (array)
+        (string)
       
       
-        (defaults to: [''])
+        (defaults to: '')
       
       
         —
         
    
-
    Array of FQDNs for hosts which
-should be allowed/required.
-every entry in the array creates a new line in
-the configuration file.
    
+
    String of FQDNs for hosts which
+should be
+allowed/required. Requires format
+'host1.example.com
+host2.example.com'
    
 
    
       
     
@@ -1835,23 +1836,20 @@ the configuration file.
    
         ng_required_ips
       
       
-        (array)
+        (string)
       
       
-        (defaults to: ['127.0.0.0/8'])
+        (defaults to: '127.0.0.0/8')
       
       
         —
         
    
-
    Array of <b>_<em>Ip addresses __** for hosts which
+
    string of <b>_<em>Ip addresses __** for hosts which
 should be
-allowed/reqired. every entry in the array creates a new line in
-the
-configuration fileIp addresses _</em></b> for hosts
-which
-should be allowed/reqired. every entry in the array creates a new
-line in
-the configuration file
    
+allowed/reqired. Requires format 'ipaddress ip address range'Ip
+addresses _</em></b> for hosts which
+should be allowed/reqired.
+Requires format 'ipaddress ip address range'
    
 
    
       
     
@@ -1873,6 +1871,7 @@ the configuration file
    
         
     
 
+203
 204
 205
 206
@@ -2029,11 +2028,10 @@ the configuration file
    
 357
 358
 359
-360
-361
    
+360
    
       
       
-        
    # File 'manifests/params.pp', line 204
+        
    # File 'manifests/params.pp', line 203
 
 class cd_nagios::params (
 
@@ -2142,8 +2140,8 @@ $ng_ack_no_send       = '0',
 $ng_use_selinux_tools = true,
 
 # httpd
-$ng_required_hosts    = [''],
-$ng_required_ips      = ['127.0.0.0/8'],
+$ng_required_hosts    = '',
+$ng_required_ips      = '127.0.0.0/8',
 
 ) {
 
@@ -2200,7 +2198,7 @@ $ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index fb9a47e..45c3e5b 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index f41565e..a6e798e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 1df61f4..7d514c3 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -228,7 +228,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index ada8a07..2781660 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index e3f13f8..8b98fda 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index b3b4867..b8dd2dc 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 00ef7138b378bf54c092834e646725222a9ad96b Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Fri, 21 Jul 2017 15:06:15 +0200
Subject: [PATCH 11/26] recommit for updates in build 25

---
 CHANGELOG.md                                  | 35 ++++++++++
 REPOSTRUCTURE.md                              |  5 +-
 doc/_index.html                               |  2 +-
 doc/file.README.html                          |  2 +-
 doc/index.html                                |  2 +-
 doc/puppet_classes/cd_nagios.html             |  2 +-
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |  2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html | 69 ++++++++++++-------
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |  2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     | 42 ++++++++++-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |  2 +-
 doc/top-level-namespace.html                  |  2 +-
 19 files changed, 136 insertions(+), 45 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5eb6b8..e12ad15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,41 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+4ec7633f976a225 Jenkins Server 2017-07-21 12:51:33
+
    
+
    recommit for updates in build 24
    
+
+
    
+5d12bf44374b934 Arne Teuke 2017-07-21 12:51:07
+
    
+
    found format options both for hosts and ips
    
+
+
    
+442fd08f623728f Arne Teuke 2017-07-21 12:44:03
+
    
+
    testing options both for hosts and ips
    
+
+
    
+b95350b8d8e58b4 Arne Teuke 2017-07-21 12:41:33
+
    
+
    testing options both for hosts and ips
    
+
+
    
+a28f890bdde57e2 Arne Teuke 2017-07-21 12:30:09
+
    
+
    testing options both for hosts and ips
    
+
+
    
+de3a7fd4fa01415 Arne Teuke 2017-07-21 12:20:44
+
    
+
    testing options both for hosts and ips
    
+
+
    
+b37864c7a366aff Arne Teuke 2017-07-21 12:15:47
+
    
+
    testing options both for hosts and ips
    
+
+
    
 109eea2716be3ae Jenkins Server 2017-07-21 11:35:04
 
    
 
    recommit for updates in build 18
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 2b150b5..e7117de 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -51,7 +51,8 @@
 |   `-- params.pp
 |-- templates
 |   |-- httpd
-|   |   `-- nagios_conf.erb
+|   |   |-- nagios_conf.erb
+|   |   `-- welcome_conf.erb
 |   |-- nagios
 |   |   |-- cgi_cfg.erb
 |   |   `-- htpasswd_rule.erb
@@ -68,4 +69,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-16 directories, 52 files
+16 directories, 53 files
diff --git a/doc/_index.html b/doc/_index.html
index e6c2f23..31ec137 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -181,7 +181,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index d74e1e3..ecd2a0d 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -297,7 +297,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 3b27837..4825303 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -297,7 +297,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index bfcbea5..b3f96c4 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index 982637c..de0ceec 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index cba9167..927e452 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index be593a1..695a577 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index 97786f3..c31c362 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 1880f6f..eb6807c 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index ef0b2b6..ab47287 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index df0dd9e..9c1f3e2 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -1854,6 +1854,19 @@ Requires format 'ipaddress ip address range'
    
       
     
   
+    
  • 
+      
+        ng_disable_welcome
+      
+      
+        (Any)
+      
+      
+        (defaults to: true)
+      
+      
+    
    • 
+  
 
 
 
@@ -2028,7 +2041,9 @@ Requires format 'ipaddress ip address range'
    
 357
 358
 359
-360
    
+360
+361
+362
    
       
       
         
    # File 'manifests/params.pp', line 203
@@ -2142,7 +2157,7 @@ $ng_use_selinux_tools = true,
 # httpd
 $ng_required_hosts    = '',
 $ng_required_ips      = '127.0.0.0/8',
-
+$ng_disable_welcome   = true,
 ) {
 
 # installation section
@@ -2158,33 +2173,35 @@ $ng_required_ips      = '127.0.0.0/8',
   }
 
 # service
-$ng_service         = 'nagios'
-$ae_service         = 'httpd'
+$ng_service           = 'nagios'
+$ae_service           = 'httpd'
 
 # directories
-$ng_main_dir        = '/etc/nagios'
-$ng_conf_d_dir      = "${ng_main_dir}/conf.d"
-$ng_objects_dir     = "${ng_main_dir}/objects"
-$ng_private_dir     = "${ng_main_dir}/private"
-$ng_usr_incl        = '/usr/include/nagios'
-$ng_lib_dir         = '/usr/lib64/nagios'
-$ng_log_dir         = '/var/log/nagios'
-$ng_log_archives    = "${ng_log_dir}/archives"
-$ng_spool_dir       = '/var/spool/nagios'
-$ng_usr_share       = '/usr/share/nagios'
-$ng_share_html      = "${ng_usr_share}/html"
+$ng_main_dir          = '/etc/nagios'
+$ng_conf_d_dir        = "${ng_main_dir}/conf.d"
+$ng_objects_dir       = "${ng_main_dir}/objects"
+$ng_private_dir       = "${ng_main_dir}/private"
+$ng_usr_incl          = '/usr/include/nagios'
+$ng_lib_dir           = '/usr/lib64/nagios'
+$ng_log_dir           = '/var/log/nagios'
+$ng_log_archives      = "${ng_log_dir}/archives"
+$ng_spool_dir         = '/var/spool/nagios'
+$ng_usr_share         = '/usr/share/nagios'
+$ng_share_html        = "${ng_usr_share}/html"
 
 # files
-$ng_main_config     = "${ng_main_dir}/nagios.cfg"
-$ng_cgi_cfg_file    = "${ng_main_dir}/cgi.cfg"
-$ng_cgi_cfg_erb     = 'cd_nagios/nagios/cgi_cfg.erb'
-$ng_htpasswd_file   = "${ng_main_dir}/passwd"
-$ng_htpasswd_head   = 'cd_nagios/nagios/htpasswd_head.erb'
-$ng_htpasswd_rule   = 'cd_nagios/nagios/htpasswd_rule.erb'
-$ng_taccgi_erb      = 'cd_nagios/selinux/taccgi.erb'
-$ng_statcgi_erb     = 'cd_nagios/selinux/statuscgi.erb'
-$ng_nagios_conf     = '/etc/httpd/conf.d/nagios.conf'
-$ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb'
+$ng_main_config       = "${ng_main_dir}/nagios.cfg"
+$ng_cgi_cfg_file      = "${ng_main_dir}/cgi.cfg"
+$ng_cgi_cfg_erb       = 'cd_nagios/nagios/cgi_cfg.erb'
+$ng_htpasswd_file     = "${ng_main_dir}/passwd"
+$ng_htpasswd_head     = 'cd_nagios/nagios/htpasswd_head.erb'
+$ng_htpasswd_rule     = 'cd_nagios/nagios/htpasswd_rule.erb'
+$ng_taccgi_erb        = 'cd_nagios/selinux/taccgi.erb'
+$ng_statcgi_erb       = 'cd_nagios/selinux/statuscgi.erb'
+$ng_nagios_conf       = '/etc/httpd/conf.d/nagios.conf'
+$ng_nagios_conf_erb   = 'cd_nagios/httpd/nagios_conf.erb'
+$ng_welcome_conf      ='/etc/httpd/conf.d/welcome.conf'
+$ng_welcome_conf_erb  = 'cd_nagios/httpd/welcome_conf.erb'
 
 # includes must be last
 
@@ -2198,7 +2215,7 @@ $ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 45c3e5b..83dbfd3 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index a6e798e..f11c02f 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 7d514c3..5cc4475 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -172,7 +172,26 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 63
 64
 65
-66
    
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
    
       
       
         
    # File 'manifests/server/files.pp', line 23
@@ -219,6 +238,25 @@ class cd_nagios::server::files (
       content   =>  template($ng_nagios_conf_erb),
       notify    =>  Service[$ae_service],
     }
+
+    # manage index.gtml for nagios web server
+
+    if $ng_disable_welcome == true {
+
+      file { $ng_welcome_conf:
+        ensure    =>  file,
+        path      =>  $ng_welcome_conf,
+        owner     =>  'root',
+        group     =>  'root',
+        mode      =>  '0644',
+        selrange  =>  s0,
+        selrole   =>  object_r,
+        seltype   =>  httpd_config_t,
+        seluser   =>  system_u,
+        content   =>  template($ng_welcome_conf_erb),
+        notify    =>  Service[$ae_service],
+      }
+    }
   }
 }
    
       
@@ -228,7 +266,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 2781660..0b6ca03 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 8b98fda..af0a928 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index b8dd2dc..77f1e8d 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 1fc9ffeacdebd206226fb373206d8ca925944b04 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Fri, 21 Jul 2017 15:43:26 +0200
Subject: [PATCH 12/26] recommit for updates in build 26

---
 CHANGELOG.md                                  | 10 +++++
 REPOSTRUCTURE.md                              |  3 +-
 doc/_index.html                               |  2 +-
 doc/file.README.html                          |  6 ++-
 doc/index.html                                |  6 ++-
 doc/puppet_classes/cd_nagios.html             |  2 +-
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |  2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html | 32 +++++++++++----
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |  2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     | 40 +++++++++++++++++--
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |  2 +-
 doc/top-level-namespace.html                  |  2 +-
 19 files changed, 94 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e12ad15..a3bd59c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+00ef7138b378bf5 Jenkins Server 2017-07-21 13:06:15
+
    
+
    recommit for updates in build 25
    
+
+
    
+46d3b02f7625b15 Arne Teuke 2017-07-21 13:05:55
+
    
+
    added control for welcome.conf
    
+
+
    
 4ec7633f976a225 Jenkins Server 2017-07-21 12:51:33
 
    
 
    recommit for updates in build 24
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index e7117de..c4685b9 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -51,6 +51,7 @@
 |   `-- params.pp
 |-- templates
 |   |-- httpd
+|   |   |-- forward_conf.erb
 |   |   |-- nagios_conf.erb
 |   |   `-- welcome_conf.erb
 |   |-- nagios
@@ -69,4 +70,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-16 directories, 53 files
+16 directories, 54 files
diff --git a/doc/_index.html b/doc/_index.html
index 31ec137..08c7a90 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -181,7 +181,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index ecd2a0d..561169e 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -143,7 +143,9 @@ parameters
 configure NRPE on clients (optional)
 * configure firewall (optional)
 *
-configure selinux policies (optional)
    
+configure selinux policies (optional)
+* configure forwarding http to https
+including accesing the /nagios url directly (optional)
    
 
 
    Service
 * manage Nagios service on server
@@ -297,7 +299,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 4825303..1e22a2e 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -143,7 +143,9 @@ parameters
 configure NRPE on clients (optional)
 * configure firewall (optional)
 *
-configure selinux policies (optional)
    
+configure selinux policies (optional)
+* configure forwarding http to https
+including accesing the /nagios url directly (optional)
    
 
 
    Service
 * manage Nagios service on server
@@ -297,7 +299,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index b3f96c4..acfd758 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index de0ceec..cecd710 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 927e452..2b088a8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index 695a577..da0da73 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index c31c362..790d7e9 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index eb6807c..0b36fc6 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index ab47287..8ad6401 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 9c1f3e2..9495efb 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -1859,12 +1859,20 @@ Requires format 'ipaddress ip address range'
    
         ng_disable_welcome
       
       
-        (Any)
+        (boolean)
       
       
         (defaults to: true)
       
       
+        —
+        
    
+
    Whether the regular welcome screen should
+be disabled. this is required for
+the nagios http check on the nagios server
+ to be successful.
    
+
    
+      
     
   
 
@@ -1884,9 +1892,6 @@ Requires format 'ipaddress ip address range'
    
         
     
 
-203
-204
-205
 206
 207
 208
@@ -2043,10 +2048,17 @@ Requires format 'ipaddress ip address range'
    
 359
 360
 361
-362
    
+362
+363
+364
+365
+366
+367
+368
+369
    - 
    # File 'manifests/params.pp', line 203
+        
    # File 'manifests/params.pp', line 206
 
 class cd_nagios::params (
 
@@ -2158,6 +2170,7 @@ $ng_use_selinux_tools = true,
 $ng_required_hosts    = '',
 $ng_required_ips      = '127.0.0.0/8',
 $ng_disable_welcome   = true,
+
 ) {
 
 # installation section
@@ -2200,8 +2213,11 @@ $ng_taccgi_erb        = 'cd_nagios/selinux/taccgi.erb'
 $ng_statcgi_erb       = 'cd_nagios/selinux/statuscgi.erb'
 $ng_nagios_conf       = '/etc/httpd/conf.d/nagios.conf'
 $ng_nagios_conf_erb   = 'cd_nagios/httpd/nagios_conf.erb'
-$ng_welcome_conf      ='/etc/httpd/conf.d/welcome.conf'
+$ng_welcome_conf      = '/etc/httpd/conf.d/welcome.conf'
 $ng_welcome_conf_erb  = 'cd_nagios/httpd/welcome_conf.erb'
+$ng_forward_conf      = '/etc/httpd/conf.d/nagios_forward.conf'
+$ng_forward_conf_erb  = 'cd_nagios/httpd/forward_conf.erb'
+
 
 # includes must be last
 
@@ -2215,7 +2231,7 @@ $ng_welcome_conf_erb  = 'cd_nagios/httpd/welcome_conf.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 83dbfd3..f39281b 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index f11c02f..98c7558 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 5cc4475..50feeb4 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -191,7 +191,24 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 82
 83
 84
-85
    
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
    # File 'manifests/server/files.pp', line 23
@@ -239,7 +256,24 @@ class cd_nagios::server::files (
       notify    =>  Service[$ae_service],
     }
 
-    # manage index.gtml for nagios web server
+    if $ng_http_https_fw == true {
+
+      file { $ng_forward_conf:
+        ensure    =>  file,
+        path      =>  $ng_forward_conf,
+        owner     =>  'root',
+        group     =>  'root',
+        mode      =>  '0644',
+        selrange  =>  s0,
+        selrole   =>  object_r,
+        seltype   =>  httpd_config_t,
+        seluser   =>  system_u,
+        content   =>  template($ng_forward_conf_erb),
+        notify    =>  Service[$ae_service],
+      }
+    }
+
+    # manage welcome.conf for nagios web server
 
     if $ng_disable_welcome == true {
 
@@ -266,7 +300,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 0b6ca03..2812d6f 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index af0a928..825f6f0 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 77f1e8d..e293fa7 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 60407116a503868f72cc1105060c40356eb3f748 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Fri, 21 Jul 2017 15:47:34 +0200
Subject: [PATCH 13/26] recommit for updates in build 27

---
 CHANGELOG.md                                           | 10 ++++++++++
 doc/_index.html                                        |  2 +-
 doc/file.README.html                                   |  2 +-
 doc/index.html                                         |  2 +-
 doc/puppet_classes/cd_nagios.html                      |  2 +-
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html             |  2 +-
 .../cd_nagios_3A_3Afirewall_3A_3Aiptables.html         |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html               |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html  |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html              |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html  |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html          |  2 +-
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html            |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html       |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html              |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html            |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html             |  2 +-
 doc/top-level-namespace.html                           |  2 +-
 18 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3bd59c..223b60b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+1fc9ffeacdebd20 Jenkins Server 2017-07-21 13:43:26
+
    
+
    recommit for updates in build 26
    
+
+
    
+d9863d874f0b88f Arne Teuke 2017-07-21 13:43:07
+
    
+
    added control for forward.conf
    
+
+
    
 00ef7138b378bf5 Jenkins Server 2017-07-21 13:06:15
 
    
 
    recommit for updates in build 25
    
diff --git a/doc/_index.html b/doc/_index.html
index 08c7a90..d9d83c8 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -181,7 +181,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 561169e..492304a 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -299,7 +299,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 1e22a2e..b244631 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -299,7 +299,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index acfd758..a406761 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index cecd710..66eed35 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 2b088a8..1192f9c 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index da0da73..3b3f42e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index 790d7e9..f40f521 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 0b36fc6..66076d7 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 8ad6401..51fcf3b 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 9495efb..5c15df8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -2231,7 +2231,7 @@ $ng_forward_conf_erb  = 'cd_nagios/httpd/forward_conf.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index f39281b..2134869 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index 98c7558..a30527c 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 50feeb4..e24c31a 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -300,7 +300,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 2812d6f..c081b85 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 825f6f0..7c879fa 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index e293fa7..adbdd9e 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 4d4f5636b803d9e7173c2b17dca6bd2fff50905f Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Fri, 21 Jul 2017 16:34:25 +0200
Subject: [PATCH 14/26] recommit for updates in build 30

---
 CHANGELOG.md                                  |  10 +
 REPOSTRUCTURE.md                              |   7 +-
 doc/_index.html                               |   7 +-
 doc/file.README.html                          |   7 +-
 doc/index.html                                |   7 +-
 doc/puppet_class_list.html                    |  29 ++-
 doc/puppet_classes/cd_nagios.html             |   2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html   | 218 ++++++++++++++++++
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |   2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |   2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html | 104 +++++++--
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |   2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |   2 +-
 doc/top-level-namespace.html                  |   2 +-
 21 files changed, 370 insertions(+), 45 deletions(-)
 create mode 100644 doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 223b60b..1814ec0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+60407116a503868 Jenkins Server 2017-07-21 13:47:34
+
    
+
    recommit for updates in build 27
    
+
+
    
+409ec084543f0d8 Arne Teuke 2017-07-21 13:47:12
+
    
+
    added control for forward.conf
    
+
+
    
 1fc9ffeacdebd20 Jenkins Server 2017-07-21 13:43:26
 
    
 
    recommit for updates in build 26
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index c4685b9..055e76b 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -31,6 +31,8 @@
 |   |-- puppet_defined_type_list.html
 |   `-- top-level-namespace.html
 |-- manifests
+|   |-- certbot
+|   |   `-- config.pp
 |   |-- client
 |   |   `-- target.pp
 |   |-- firewall
@@ -50,6 +52,9 @@
 |   |-- init.pp
 |   `-- params.pp
 |-- templates
+|   |-- certbot
+|   |   |-- get_cert.erb
+|   |   `-- unless_get_cert.erb
 |   |-- httpd
 |   |   |-- forward_conf.erb
 |   |   |-- nagios_conf.erb
@@ -70,4 +75,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-16 directories, 54 files
+18 directories, 57 files
diff --git a/doc/_index.html b/doc/_index.html
index d9d83c8..7386db1 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -73,6 +73,11 @@
       
             
     
+            
  • 
+      cd_nagios::certbot::config
+      
+            
    • 
+    
             
  • 
       cd_nagios::client::target
       
@@ -181,7 +186,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 492304a..c8e1439 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -61,7 +61,7 @@
 
    |Repo Name| version | Build
 Status|
 |---|---|---|---|
-|cd_nagios| 0.0.0.7 | cd_nagios| 0.0.0.8 | {Build
 Status/]|
    
 
@@ -174,6 +174,9 @@ firewall (optional)
    
 
  • 
 
    cd_selinux
 for selinux policy adjustments
    
+
  • 
+
    cd_certbot
+to auto-manage TLS certificates (optional)
    
 
    • 
 
 
    Deployment
    
@@ -299,7 +302,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index b244631..cae5a69 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -61,7 +61,7 @@
 
    |Repo Name| version | Build
 Status|
 |---|---|---|---|
-|cd_nagios| 0.0.0.7 | cd_nagios| 0.0.0.8 | {Build
 Status/]|
    
 
@@ -174,6 +174,9 @@ firewall (optional)
    
 
  • 
 
    cd_selinux
 for selinux policy adjustments
    
+
  • 
+
    cd_certbot
+to auto-manage TLS certificates (optional)
    
 
    • 
 
 
    Deployment
    
@@ -299,7 +302,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index d7b54ba..898b58e 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -47,77 +47,84 @@
     
     
 
-    
  • 
+    
  • 
+      
    
+        cd_nagios::certbot::config
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         cd_nagios::client::target
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::firewall::iptables
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::main::config
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::main::dirs
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::main::install
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::main::user
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::params
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::selinux::config
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::access_rules
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::files
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::service
       
    
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index a406761..02516ee 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
new file mode 100644
index 0000000..ce54145
--- /dev/null
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
@@ -0,0 +1,218 @@
+
+
+  
+    
+
+
+  Puppet Class: cd_nagios::certbot::config
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: cd_nagios::certbot::config
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    cd_nagios::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/certbot/config.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages all configuration files required for cd_nagios.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::certbot::config.pp
+Module name: cd_nagios
+Author: Arne Teuke
+(arne_teuke@ConfDroid.com)
    
+
+
    License:
    
+
+
    This file is part of cd_nagios.
    
+
+
    cd_nagios is used for providing automatic configuration of Nagios
+
+Copyright (C) 2016 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/.
    
+
+  
    
+
    
+
    
+  
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
    
+          		
+        
    # File 'manifests/certbot/config.pp', line 23
+
+class cd_nagios::certbot::config (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+    if $ng_enable_certbot == true {
+
+      require cd_certbot
+
+      # create cert
+
+      exec { 'create_cert':
+        command   =>  template('cd_nagios/certbot/get_cert.erb'),
+        cwd       =>  '/tmp',
+        path      =>  ['/bin','/usr/bin'],
+        provider  =>  'shell',
+        unless    =>  template('cd_nagios/certbot/unless_get_cert.erb'),
+        notify    =>  Service['httpd'],
+        creates   =>  '/etc/httpd/conf.d/.cert_created',
+       }
+
+      # renew certs
+
+      exec {  'renew_cert':
+        command   =>  'certbot renew',
+        cwd       =>  '/tmp',
+        path      =>  ['/bin','/usr/bin','/opt/'],
+        provider  =>  'shell',
+        notify    =>  Service['httpd'],
+        unless    =>  template('cd_nagios/certbot/unless_renew_cert.erb'),
+      }
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index 66eed35..b879f96 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 1192f9c..f51a4bb 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index 3b3f42e..e8d073e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index f40f521..ee2f010 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 66076d7..806b849 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 51fcf3b..bcaf6f4 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 5c15df8..ea160d8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -79,6 +79,8 @@
       
       cd_nagios::client::target
    
       
+      cd_nagios::certbot::config
    
+      
       cd_nagios::selinux::config
    
       
       cd_nagios::server::service
    
@@ -1826,7 +1828,7 @@ enabled.
    
 should be
 allowed/required. Requires format
 'host1.example.com
-host2.example.com'
    
+host2.example.com'. If you want no restriction, chose 'all'.
    
 
       
     
    • 
@@ -1846,10 +1848,14 @@ host2.example.com'
    
         
    
 
    string of <b>_<em>Ip addresses __** for hosts which
 should be
-allowed/reqired. Requires format 'ipaddress ip address range'Ip
-addresses _</em></b> for hosts which
-should be allowed/reqired.
-Requires format 'ipaddress ip address range'
    
+allowed/reqired. Requires format 'ipaddress ip address range'.
+If
+you want no restriction, choose '0.0.0.0/0'Ip addresses
+_</em></b> for hosts which
+should be allowed/reqired. Requires
+format 'ipaddress ip address range'.
+If you want no restriction,
+choose '0.0.0.0/0'
    
 
    
       
     
@@ -1875,6 +1881,64 @@ the nagios http check on the nagios server
       
     
   
+    
  • 
+      
+        ng_enable_certbot
+      
+      
+        (boolean)
+      
+      
+        (defaults to: true)
+      
+      
+        —
+        
    
+
    Whether to use certbot for automated TLS
+certificate management
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_certbot_cert_path
+      
+      
+        (string)
+      
+      
+        (defaults to: '/var/www/html')
+      
+      
+        —
+        
    
+
    the path for certbot to place
+challenges for teh certification process.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_mail_user
+      
+      
+        (string)
+      
+      
+        (defaults to: "admin@${::domain}")
+      
+      
+        —
+        
    
+
    email address to receive administrative mail.
+used for nagios itself as
+well as for certbot.
    
+
    
+      
+    
    • 
+  
 
 
 
@@ -1892,13 +1956,6 @@ the nagios http check on the nagios server
         
     
 
-206
-207
-208
-209
-210
-211
-212
 213
 214
 215
@@ -2055,10 +2112,22 @@ the nagios http check on the nagios server
 366
 367
 368
-369
    
+369
+370
+371
+372
+373
+374
+375
+376
+377
+378
+379
+380
+381
    - 
    # File 'manifests/params.pp', line 206
+        
    # File 'manifests/params.pp', line 213
 
 class cd_nagios::params (
 
@@ -2066,6 +2135,7 @@ $pkg_ensure           = 'latest',
 
 $ng_nagios_server     = "nagios.${::domain}",
 $ng_nagios_ext_ip     = undef,
+$ng_mail_user         = "admin@${::domain}",
 
 $ng_include_nrpe      = true,
 
@@ -2171,6 +2241,10 @@ $ng_required_hosts    = '',
 $ng_required_ips      = '127.0.0.0/8',
 $ng_disable_welcome   = true,
 
+# certbot
+$ng_enable_certbot    = true,
+$ng_certbot_cert_path = '/var/www/html',
+
 ) {
 
 # installation section
@@ -2231,7 +2305,7 @@ $ng_forward_conf_erb  = 'cd_nagios/httpd/forward_conf.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 2134869..92fee8d 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index a30527c..e15fb30 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index e24c31a..7894bb0 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -300,7 +300,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index c081b85..35cb2f0 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 7c879fa..4d4a689 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index adbdd9e..aa02f34 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 353e7e99cf9259475fb8446971d911307731c0d5 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Fri, 21 Jul 2017 16:42:28 +0200
Subject: [PATCH 15/26] recommit for updates in build 33

---
 CHANGELOG.md                                  | 165 ++++++++++--------
 REPOSTRUCTURE.md                              |   3 +-
 doc/_index.html                               |   2 +-
 doc/file.README.html                          |   6 +-
 doc/index.html                                |   6 +-
 doc/puppet_classes/cd_nagios.html             |   2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html   |   4 +-
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |   2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |  14 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |   2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html |   2 +-
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |   2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |   2 +-
 doc/top-level-namespace.html                  |   2 +-
 20 files changed, 133 insertions(+), 93 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1814ec0..d2f021b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,105 +8,45 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+4d4f5636b803d9e Jenkins Server 2017-07-21 14:34:25
+
    
+
    recommit for updates in build 30
    
+
+
    
+2543121abaf145b Arne Teuke 2017-07-21 14:33:05
+
    
+
    added certbot section
    
+
+
    
 60407116a503868 Jenkins Server 2017-07-21 13:47:34
 
    
 
    recommit for updates in build 27
    
 
-
    
-409ec084543f0d8 Arne Teuke 2017-07-21 13:47:12
-
    
-
    added control for forward.conf
    
-
 
    
 1fc9ffeacdebd20 Jenkins Server 2017-07-21 13:43:26
 
    
 
    recommit for updates in build 26
    
 
-
    
-d9863d874f0b88f Arne Teuke 2017-07-21 13:43:07
-
    
-
    added control for forward.conf
    
-
 
    
 00ef7138b378bf5 Jenkins Server 2017-07-21 13:06:15
 
    
 
    recommit for updates in build 25
    
 
-
    
-46d3b02f7625b15 Arne Teuke 2017-07-21 13:05:55
-
    
-
    added control for welcome.conf
    
-
 
    
 4ec7633f976a225 Jenkins Server 2017-07-21 12:51:33
 
    
 
    recommit for updates in build 24
    
 
-
    
-5d12bf44374b934 Arne Teuke 2017-07-21 12:51:07
-
    
-
    found format options both for hosts and ips
    
-
-
    
-442fd08f623728f Arne Teuke 2017-07-21 12:44:03
-
    
-
    testing options both for hosts and ips
    
-
-
    
-b95350b8d8e58b4 Arne Teuke 2017-07-21 12:41:33
-
    
-
    testing options both for hosts and ips
    
-
-
    
-a28f890bdde57e2 Arne Teuke 2017-07-21 12:30:09
-
    
-
    testing options both for hosts and ips
    
-
-
    
-de3a7fd4fa01415 Arne Teuke 2017-07-21 12:20:44
-
    
-
    testing options both for hosts and ips
    
-
-
    
-b37864c7a366aff Arne Teuke 2017-07-21 12:15:47
-
    
-
    testing options both for hosts and ips
    
-
 
    
 109eea2716be3ae Jenkins Server 2017-07-21 11:35:04
 
    
 
    recommit for updates in build 18
    
 
-
    
-5de81e818498830 Arne Teuke 2017-07-21 11:34:48
-
    
-
    testing options both for hosts and ips
    
-
-
    
-41434c9607ab037 Arne Teuke 2017-07-21 11:28:50
-
    
-
    adding options both for hosts and ips
    
-
-
    
-544f48d800ad39a Arne Teuke 2017-07-21 11:21:12
-
    
-
    adding options both for hosts and ips
    
-
 
    
 969e377d5db6423 Jenkins Server 2017-07-21 11:06:59
 
    
 
    recommit for updates in build 15
    
 
-
    
-e402224ff9bb367 Arne Teuke 2017-07-21 11:06:36
-
    
-
    trying empty array
    
-
-
    
-49551a3d9af3460 Arne Teuke 2017-07-21 10:43:06
-
    
-
    included control for nagios.conf
    
-
 
    
 05036af24182601 Jenkins Server 2017-07-20 16:26:40
 
    
@@ -144,6 +84,91 @@ Changelog of Git Changelog.
 
 
    
 
+
     v0.0.0.8 
    
+
     No issue 
    
+
+
+e160b3f919967bc Arne Teuke 2017-07-21 14:03:09
+
    
+
    finished nagios.conf
    
+
+
    
+5311e868eec2343 Arne Teuke 2017-07-21 13:57:05
+
    
+
    chenged forwarding to allow http as well too
    
+
+
    
+409ec084543f0d8 Arne Teuke 2017-07-21 13:47:12
+
    
+
    added control for forward.conf
    
+
+
    
+d9863d874f0b88f Arne Teuke 2017-07-21 13:43:07
+
    
+
    added control for forward.conf
    
+
+
    
+46d3b02f7625b15 Arne Teuke 2017-07-21 13:05:55
+
    
+
    added control for welcome.conf
    
+
+
    
+5d12bf44374b934 Arne Teuke 2017-07-21 12:51:07
+
    
+
    found format options both for hosts and ips
    
+
+
    
+442fd08f623728f Arne Teuke 2017-07-21 12:44:03
+
    
+
    testing options both for hosts and ips
    
+
+
    
+b95350b8d8e58b4 Arne Teuke 2017-07-21 12:41:33
+
    
+
    testing options both for hosts and ips
    
+
+
    
+a28f890bdde57e2 Arne Teuke 2017-07-21 12:30:09
+
    
+
    testing options both for hosts and ips
    
+
+
    
+de3a7fd4fa01415 Arne Teuke 2017-07-21 12:20:44
+
    
+
    testing options both for hosts and ips
    
+
+
    
+b37864c7a366aff Arne Teuke 2017-07-21 12:15:47
+
    
+
    testing options both for hosts and ips
    
+
+
    
+5de81e818498830 Arne Teuke 2017-07-21 11:34:48
+
    
+
    testing options both for hosts and ips
    
+
+
    
+41434c9607ab037 Arne Teuke 2017-07-21 11:28:50
+
    
+
    adding options both for hosts and ips
    
+
+
    
+544f48d800ad39a Arne Teuke 2017-07-21 11:21:12
+
    
+
    adding options both for hosts and ips
    
+
+
    
+e402224ff9bb367 Arne Teuke 2017-07-21 11:06:36
+
    
+
    trying empty array
    
+
+
    
+49551a3d9af3460 Arne Teuke 2017-07-21 10:43:06
+
    
+
    included control for nagios.conf
    
+
+
    
+
 
     v0.0.0.7 
    
 
     No issue 
    
 
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 055e76b..2750e87 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -9,6 +9,7 @@
 |   |   |-- full_list.js
 |   |   `-- jquery.js
 |   |-- puppet_classes
+|   |   |-- cd_nagios_3A_3Acertbot_3A_3Aconfig.html
 |   |   |-- cd_nagios_3A_3Aclient_3A_3Atarget.html
 |   |   |-- cd_nagios_3A_3Afirewall_3A_3Aiptables.html
 |   |   |-- cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -75,4 +76,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-18 directories, 57 files
+18 directories, 58 files
diff --git a/doc/_index.html b/doc/_index.html
index 7386db1..cc69729 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -186,7 +186,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index c8e1439..1032b6d 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -145,7 +145,9 @@ configure NRPE on clients (optional)
 *
 configure selinux policies (optional)
 * configure forwarding http to https
-including accesing the /nagios url directly (optional)
    
+including accesing the /nagios url directly (optional)
+* manage TLS
+certificates through certbot (optional)
    
 
 
    Service
 * manage Nagios service on server
@@ -302,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index cae5a69..ae76248 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -145,7 +145,9 @@ configure NRPE on clients (optional)
 *
 configure selinux policies (optional)
 * configure forwarding http to https
-including accesing the /nagios url directly (optional)
    
+including accesing the /nagios url directly (optional)
+* manage TLS
+certificates through certbot (optional)
    
 
 
    Service
 * manage Nagios service on server
@@ -302,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index 02516ee..ac49e1e 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
index ce54145..2cc3d75 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
@@ -186,7 +186,7 @@ class cd_nagios::certbot::config (
         unless    =>  template('cd_nagios/certbot/unless_get_cert.erb'),
         notify    =>  Service['httpd'],
         creates   =>  '/etc/httpd/conf.d/.cert_created',
-       }
+      }
 
       # renew certs
 
@@ -208,7 +208,7 @@ class cd_nagios::certbot::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index b879f96..7d2ae7b 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index f51a4bb..596c668 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index e8d073e..800ff61 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -152,7 +152,12 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 43
 44
 45
-46
    
+46
+47
+48
+49
+50
+51
    # File 'manifests/main/config.pp', line 24
@@ -173,6 +178,11 @@ class cd_nagios::main::config (
     if $ng_use_selinux_tools == true {
       include cd_nagios::selinux::config
     }
+
+    if $ng_enable_certbot == true {
+      include cd_nagios::certbot::config
+    }
+
   }
 
   if $::fqdn != $ng_nagios_server {
@@ -187,7 +197,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index ee2f010..7328045 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 806b849..74acc56 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index bcaf6f4..3051e73 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index ea160d8..69dddff 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -2305,7 +2305,7 @@ $ng_forward_conf_erb  = 'cd_nagios/httpd/forward_conf.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 92fee8d..dbefd4d 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index e15fb30..1a2818d 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 7894bb0..f2790d8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -300,7 +300,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 35cb2f0..b7072fd 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 4d4a689..75f2cbb 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index aa02f34..9db8418 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 2c6b5f8656e9fefbd19f24b8e9efa30fb0e7177a Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Fri, 21 Jul 2017 16:51:54 +0200
Subject: [PATCH 16/26] recommit for updates in build 34

---
 CHANGELOG.md                                      | 15 +++++++++++++++
 REPOSTRUCTURE.md                                  |  5 +++--
 doc/_index.html                                   |  2 +-
 doc/file.README.html                              |  2 +-
 doc/index.html                                    |  2 +-
 doc/puppet_classes/cd_nagios.html                 |  2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html       |  6 +++---
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html        |  2 +-
 .../cd_nagios_3A_3Afirewall_3A_3Aiptables.html    |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html          |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html            |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html         |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html            |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html     | 10 +++++++---
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html       |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html  |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html         |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html       |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html        |  2 +-
 doc/top-level-namespace.html                      |  2 +-
 20 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2f021b..0bc8730 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+353e7e99cf92594 Jenkins Server 2017-07-21 14:42:28
+
    
+
    recommit for updates in build 33
    
+
+
    
+e6b974ad08de5d5 Arne Teuke 2017-07-21 14:40:41
+
    
+
    fixed typo
    
+
+
    
+c2f38a68165529b Arne Teuke 2017-07-21 14:38:51
+
    
+
    added and linked certbot
    
+
+
    
 4d4f5636b803d9e Jenkins Server 2017-07-21 14:34:25
 
    
 
    recommit for updates in build 30
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 2750e87..09b92c5 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -55,7 +55,8 @@
 |-- templates
 |   |-- certbot
 |   |   |-- get_cert.erb
-|   |   `-- unless_get_cert.erb
+|   |   |-- unless_get_cert.erb
+|   |   `-- unless_renew_cert.erb
 |   |-- httpd
 |   |   |-- forward_conf.erb
 |   |   |-- nagios_conf.erb
@@ -76,4 +77,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-18 directories, 58 files
+18 directories, 59 files
diff --git a/doc/_index.html b/doc/_index.html
index cc69729..3acb26f 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -186,7 +186,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 1032b6d..afa5949 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index ae76248..dff6c49 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index ac49e1e..ccb2727 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
index 2cc3d75..4dbfa58 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
@@ -179,7 +179,7 @@ class cd_nagios::certbot::config (
       # create cert
 
       exec { 'create_cert':
-        command   =>  template('cd_nagios/certbot/get_cert.erb'),
+        command   =>  template($ng_get_cert_erb),
         cwd       =>  '/tmp',
         path      =>  ['/bin','/usr/bin'],
         provider  =>  'shell',
@@ -196,7 +196,7 @@ class cd_nagios::certbot::config (
         path      =>  ['/bin','/usr/bin','/opt/'],
         provider  =>  'shell',
         notify    =>  Service['httpd'],
-        unless    =>  template('cd_nagios/certbot/unless_renew_cert.erb'),
+        unless    =>  template($ng_unless_renew_erb),
       }
     }
   }
@@ -208,7 +208,7 @@ class cd_nagios::certbot::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index 7d2ae7b..f5ceb15 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 596c668..01309fa 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index 800ff61..a6179c4 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -197,7 +197,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index 7328045..63e1d00 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 74acc56..b850153 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 3051e73..1c7f136 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 69dddff..38826e2 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -2124,7 +2124,9 @@ well as for certbot.
    
 378
 379
 380
-381
    +381 +382 +383 
    # File 'manifests/params.pp', line 213
@@ -2291,7 +2293,9 @@ $ng_welcome_conf      = '/etc/httpd/conf.d/welcome.conf'
 $ng_welcome_conf_erb  = 'cd_nagios/httpd/welcome_conf.erb'
 $ng_forward_conf      = '/etc/httpd/conf.d/nagios_forward.conf'
 $ng_forward_conf_erb  = 'cd_nagios/httpd/forward_conf.erb'
-
+$ng_get_cert_erb      = 'cd_nagios/certbot/get_cert.erb'
+$ng_unless_get_cert   = 'cd_nagios/certbot/unless_get_cert.erb'
+$ng_unless_renew_erb  =  'cd_nagios/certbot/unless_renew_cert.erb'
 
 # includes must be last
 
@@ -2305,7 +2309,7 @@ $ng_forward_conf_erb  = 'cd_nagios/httpd/forward_conf.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index dbefd4d..b114d14 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index 1a2818d..d440991 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index f2790d8..2307339 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -300,7 +300,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index b7072fd..bf2038b 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 75f2cbb..dabcfee 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 9db8418..a3baa7c 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 183e17f460c21ab257c6ba30dc341ed0d9ad0761 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Fri, 21 Jul 2017 17:16:28 +0200
Subject: [PATCH 17/26] recommit for updates in build 35

---
 CHANGELOG.md                                  |  10 +
 REPOSTRUCTURE.md                              |   3 +-
 doc/_index.html                               |   2 +-
 doc/file.README.html                          |   2 +-
 doc/index.html                                |   2 +-
 doc/puppet_classes/cd_nagios.html             |   2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html   |  64 ++++-
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |   2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |  14 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |   2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html |  10 +-
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |   2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     | 244 ++++++++++++++----
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |   2 +-
 doc/top-level-namespace.html                  |   2 +-
 20 files changed, 295 insertions(+), 78 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bc8730..88fc7e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+2c6b5f8656e9fef Jenkins Server 2017-07-21 14:51:54
+
    
+
    recommit for updates in build 34
    
+
+
    
+3923a4adc5e4443 Arne Teuke 2017-07-21 14:51:28
+
    
+
    changed config to use variables, added parameters
    
+
+
    
 353e7e99cf92594 Jenkins Server 2017-07-21 14:42:28
 
    
 
    recommit for updates in build 33
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 09b92c5..b258133 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -54,6 +54,7 @@
 |   `-- params.pp
 |-- templates
 |   |-- certbot
+|   |   |-- create_tempfile.erb
 |   |   |-- get_cert.erb
 |   |   |-- unless_get_cert.erb
 |   |   `-- unless_renew_cert.erb
@@ -77,4 +78,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-18 directories, 59 files
+18 directories, 60 files
diff --git a/doc/_index.html b/doc/_index.html
index 3acb26f..d0108e3 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -186,7 +186,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index afa5949..d433ed3 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index dff6c49..189ba57 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index ccb2727..aaa7e24 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
index 4dbfa58..0db5903 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
@@ -162,7 +162,37 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 53
 54
 55
-56
    +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 
    # File 'manifests/certbot/config.pp', line 23
@@ -176,6 +206,24 @@ class cd_nagios::certbot::config (
 
       require cd_certbot
 
+      # ensure there is no forward vhost file
+
+      exec { 'remove forward vhost':
+        command   =>  "rm -Rf  $ng_forward_conf",
+        creates   =>  '/etc/httpd/conf.d/.cert_created',
+      }
+
+      # create temp vhost file
+
+      exec { 'create_temp_vhost':
+        command   =>  template('cd_nagios/certbot/create_tempfile.erb'),
+        cwd       =>  '/tmp',
+        path      =>  ['/bin','/usr/bin'],
+        provider  =>  'shell',
+        creates   =>  '/etc/httpd/conf.d/.created',
+        notify    =>  Service['httpd'],
+      }
+
       # create cert
 
       exec { 'create_cert':
@@ -188,6 +236,18 @@ class cd_nagios::certbot::config (
         creates   =>  '/etc/httpd/conf.d/.cert_created',
       }
 
+      # remove temp_vhost
+
+      exec { 'remove_temp_vhost':
+        command   =>  "rm -Rf ${ng_certbot_temp_file}",
+        cwd       =>  '/tmp',
+        path      =>  ['/bin','/usr/bin'],
+        provider  =>  'shell',
+        notify    =>  Service['httpd'],
+        require   =>  Exec['create_cert'],
+        creates   =>  "/etc/letsencrypt/live/${ng_nagios_server}/cert.pem",
+      }
+
       # renew certs
 
       exec {  'renew_cert':
@@ -208,7 +268,7 @@ class cd_nagios::certbot::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index f5ceb15..54a4c3e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 01309fa..8133710 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index a6179c4..e3cd2fc 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -152,12 +152,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 43
 44
 45
-46
-47
-48
-49
-50
-51
    +46 
    # File 'manifests/main/config.pp', line 24
@@ -178,11 +173,6 @@ class cd_nagios::main::config (
     if $ng_use_selinux_tools == true {
       include cd_nagios::selinux::config
     }
-
-    if $ng_enable_certbot == true {
-      include cd_nagios::certbot::config
-    }
-
   }
 
   if $::fqdn != $ng_nagios_server {
@@ -197,7 +187,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index 63e1d00..7d90536 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index b850153..454b52b 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 1c7f136..2483cec 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 38826e2..acd537f 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -2126,7 +2126,9 @@ well as for certbot.
    
 380
 381
 382
-383
    +383 +384 +385 
    # File 'manifests/params.pp', line 213
@@ -2295,7 +2297,9 @@ $ng_forward_conf      = '/etc/httpd/conf.d/nagios_forward.conf'
 $ng_forward_conf_erb  = 'cd_nagios/httpd/forward_conf.erb'
 $ng_get_cert_erb      = 'cd_nagios/certbot/get_cert.erb'
 $ng_unless_get_cert   = 'cd_nagios/certbot/unless_get_cert.erb'
-$ng_unless_renew_erb  =  'cd_nagios/certbot/unless_renew_cert.erb'
+$ng_unless_renew_erb  = 'cd_nagios/certbot/unless_renew_cert.erb'
+$ng_create_tempvhost  = 'cd_nagios/certbot/create_tempfile.erb'
+$ng_certbot_temp_file = '/etc/httpd/conf.d/certbot_temp.conf'
 
 # includes must be last
 
@@ -2309,7 +2313,7 @@ $ng_unless_renew_erb  =  'cd_nagios/certbot/unless_renew_cert.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index b114d14..958c178 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index d440991..622252f 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 2307339..0687719 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -208,7 +208,83 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 99
 100
 101
-102
    +102 +103 +104 +105 +106 +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 +128 +129 +130 +131 +132 +133 +134 +135 +136 +137 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 +151 +152 +153 +154 +155 +156 +157 +158 +159 +160 +161 +162 +163 +164 +165 +166 +167 +168 +169 +170 +171 +172 +173 +174 +175 +176 +177 +178 
    # File 'manifests/server/files.pp', line 23
@@ -218,49 +294,34 @@ class cd_nagios::server::files (
 ) inherits cd_nagios::params {
 
   if $::fqdn == $ng_nagios_server {
+    if $ng_enable_certbot == true {
+      require cd_nagios::certbot::config
+      require cd_nagios::main::dirs
 
-  require cd_nagios::main::dirs
-
-    # manage nagios.cfg
+      # manage nagios.cfg
 
 
-    # manage cgi.cfg
+      # manage cgi.cfg
 
-    file { $ng_cgi_cfg_file:
-      ensure    =>  file,
-      path      =>  $ng_cgi_cfg_file,
-      owner     =>  'root',
-      group     =>  'root',
-      mode      =>  '0644',
-      selrange  =>  s0,
-      selrole   =>  object_r,
-      seltype   =>  nagios_etc_t,
-      seluser   =>  system_u,
-      content   =>  template($ng_cgi_cfg_erb),
-      notify    =>  Service[$ng_service],
-    }
-
-    # manage nagios.conf for httpd
-
-    file { $ng_nagios_conf:
-      ensure    =>  file,
-      path      =>  $ng_nagios_conf,
-      owner     =>  'root',
-      group     =>  'root',
-      mode      =>  '0644',
-      selrange  =>  s0,
-      selrole   =>  object_r,
-      seltype   =>  httpd_config_t,
-      seluser   =>  system_u,
-      content   =>  template($ng_nagios_conf_erb),
-      notify    =>  Service[$ae_service],
-    }
-
-    if $ng_http_https_fw == true {
-
-      file { $ng_forward_conf:
+      file { $ng_cgi_cfg_file:
         ensure    =>  file,
-        path      =>  $ng_forward_conf,
+        path      =>  $ng_cgi_cfg_file,
+        owner     =>  'root',
+        group     =>  'root',
+        mode      =>  '0644',
+        selrange  =>  s0,
+        selrole   =>  object_r,
+        seltype   =>  nagios_etc_t,
+        seluser   =>  system_u,
+        content   =>  template($ng_cgi_cfg_erb),
+        notify    =>  Service[$ng_service],
+      }
+
+      # manage nagios.conf for httpd
+
+      file { $ng_nagios_conf:
+        ensure    =>  file,
+        path      =>  $ng_nagios_conf,
         owner     =>  'root',
         group     =>  'root',
         mode      =>  '0644',
@@ -268,18 +329,73 @@ class cd_nagios::server::files (
         selrole   =>  object_r,
         seltype   =>  httpd_config_t,
         seluser   =>  system_u,
-        content   =>  template($ng_forward_conf_erb),
+        content   =>  template($ng_nagios_conf_erb),
         notify    =>  Service[$ae_service],
       }
+
+      if $ng_http_https_fw == true {
+        file { $ng_forward_conf:
+          ensure    =>  file,
+          path      =>  $ng_forward_conf,
+          owner     =>  'root',
+          group     =>  'root',
+          mode      =>  '0644',
+          selrange  =>  s0,
+          selrole   =>  object_r,
+          seltype   =>  httpd_config_t,
+          seluser   =>  system_u,
+          content   =>  template($ng_forward_conf_erb),
+          notify    =>  Service[$ae_service],
+        }
+      }
+
+      # manage welcome.conf for nagios web server
+
+      if $ng_disable_welcome == true {
+        file { $ng_welcome_conf:
+          ensure    =>  file,
+          path      =>  $ng_welcome_conf,
+          owner     =>  'root',
+          group     =>  'root',
+          mode      =>  '0644',
+          selrange  =>  s0,
+          selrole   =>  object_r,
+          seltype   =>  httpd_config_t,
+          seluser   =>  system_u,
+          content   =>  template($ng_welcome_conf_erb),
+          notify    =>  Service[$ae_service],
+        }
+      }
     }
 
-    # manage welcome.conf for nagios web server
+  else {
 
-    if $ng_disable_welcome == true {
+    require cd_nagios::main::dirs
 
-      file { $ng_welcome_conf:
+      # manage nagios.cfg
+
+
+      # manage cgi.cfg
+
+      file { $ng_cgi_cfg_file:
         ensure    =>  file,
-        path      =>  $ng_welcome_conf,
+        path      =>  $ng_cgi_cfg_file,
+        owner     =>  'root',
+        group     =>  'root',
+        mode      =>  '0644',
+        selrange  =>  s0,
+        selrole   =>  object_r,
+        seltype   =>  nagios_etc_t,
+        seluser   =>  system_u,
+        content   =>  template($ng_cgi_cfg_erb),
+        notify    =>  Service[$ng_service],
+      }
+
+      # manage nagios.conf for httpd
+
+      file { $ng_nagios_conf:
+        ensure    =>  file,
+        path      =>  $ng_nagios_conf,
         owner     =>  'root',
         group     =>  'root',
         mode      =>  '0644',
@@ -287,9 +403,45 @@ class cd_nagios::server::files (
         selrole   =>  object_r,
         seltype   =>  httpd_config_t,
         seluser   =>  system_u,
-        content   =>  template($ng_welcome_conf_erb),
+        content   =>  template($ng_nagios_conf_erb),
         notify    =>  Service[$ae_service],
       }
+
+      if $ng_http_https_fw == true {
+
+        file { $ng_forward_conf:
+          ensure    =>  file,
+          path      =>  $ng_forward_conf,
+          owner     =>  'root',
+          group     =>  'root',
+          mode      =>  '0644',
+          selrange  =>  s0,
+          selrole   =>  object_r,
+          seltype   =>  httpd_config_t,
+          seluser   =>  system_u,
+          content   =>  template($ng_forward_conf_erb),
+          notify    =>  Service[$ae_service],
+        }
+      }
+
+      # manage welcome.conf for nagios web server
+
+      if $ng_disable_welcome == true {
+
+        file { $ng_welcome_conf:
+          ensure    =>  file,
+          path      =>  $ng_welcome_conf,
+          owner     =>  'root',
+          group     =>  'root',
+          mode      =>  '0644',
+          selrange  =>  s0,
+          selrole   =>  object_r,
+          seltype   =>  httpd_config_t,
+          seluser   =>  system_u,
+          content   =>  template($ng_welcome_conf_erb),
+          notify    =>  Service[$ae_service],
+        }
+      }
     }
   }
 }
    @@ -300,7 +452,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index bf2038b..b436392 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -174,7 +174,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index dabcfee..a1e4efe 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index a3baa7c..cc03c40 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From abeba0589d446def467a724b84ffbb1b92f7df38 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 21 Jul 2017 17:18:35 +0200 Subject: [PATCH 18/26] recommit for updates in build 36 --- CHANGELOG.md | 10 ++++++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html | 4 ++-- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- .../cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 19 files changed, 29 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88fc7e1..538025b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +183e17f460c21ab Jenkins Server 2017-07-21 15:16:28 +

    +

    recommit for updates in build 35

    + +

    +0d2f0ae3e8ebe63 Arne Teuke 2017-07-21 15:15:59 +

    +

    re-chained certbot

    + +

    2c6b5f8656e9fef Jenkins Server 2017-07-21 14:51:54

    recommit for updates in build 34

    diff --git a/doc/_index.html b/doc/_index.html index d0108e3..02fbff7 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -186,7 +186,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index d433ed3..db7bc43 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -304,7 +304,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 189ba57..9a6ed82 100644 --- a/doc/index.html +++ b/doc/index.html @@ -304,7 +304,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index aaa7e24..a6c396b 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html index 0db5903..37675e2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html @@ -209,7 +209,7 @@ class cd_nagios::certbot::config ( # ensure there is no forward vhost file exec { 'remove forward vhost': - command => "rm -Rf $ng_forward_conf", + command => "rm -Rf ${ng_forward_conf}", creates => '/etc/httpd/conf.d/.cert_created', } @@ -268,7 +268,7 @@ class cd_nagios::certbot::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html index 54a4c3e..3824b22 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -368,7 +368,7 @@ class cd_nagios::client::target ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index 8133710..73bc277 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index e3cd2fc..8174853 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -187,7 +187,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index 7d90536..2b9fdee 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 454b52b..6cd79ad 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 2483cec..c068e14 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index acd537f..972cdf8 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -2313,7 +2313,7 @@ $ng_certbot_temp_file = '/etc/httpd/conf.d/certbot_temp.conf' diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index 958c178..c630b99 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -249,7 +249,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index 622252f..b5388f0 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -195,7 +195,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index 0687719..7f375d6 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -452,7 +452,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index b436392..ad5dd36 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -174,7 +174,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index a1e4efe..ee562d0 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index cc03c40..b4500f0 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 919531809c41d5a3db48c0153042e2f52cecb6d4 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 21 Jul 2017 17:24:59 +0200 Subject: [PATCH 19/26] recommit for updates in build 37 --- CHANGELOG.md | 10 ++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html | 122 ++++++++++-------- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 19 files changed, 96 insertions(+), 70 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 538025b..3d05fe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +abeba0589d446de Jenkins Server 2017-07-21 15:18:35 +

    +

    recommit for updates in build 36

    + +

    +01324789d29fa72 Arne Teuke 2017-07-21 15:18:10 +

    +

    re-chained certbot

    + +

    183e17f460c21ab Jenkins Server 2017-07-21 15:16:28

    recommit for updates in build 35

    diff --git a/doc/_index.html b/doc/_index.html index 02fbff7..9e9640a 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -186,7 +186,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index db7bc43..ba17304 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -304,7 +304,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 9a6ed82..58426ca 100644 --- a/doc/index.html +++ b/doc/index.html @@ -304,7 +304,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index a6c396b..6109d71 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html index 37675e2..d6ab931 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html @@ -192,7 +192,15 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    83 84 85 -86 +86 +87 +88 +89 +90 +91 +92 +93 +94 
    # File 'manifests/certbot/config.pp', line 23
@@ -202,62 +210,70 @@ class cd_nagios::certbot::config (
 ) inherits cd_nagios::params {
 
   if $::fqdn == $ng_nagios_server {
-    if $ng_enable_certbot == true {
+    if $ng_use_https == true {
+      if $ng_enable_certbot == true {
 
-      require cd_certbot
+        require cd_certbot
 
-      # ensure there is no forward vhost file
+        # ensure there is no forward vhost file
 
-      exec { 'remove forward vhost':
-        command   =>  "rm -Rf ${ng_forward_conf}",
-        creates   =>  '/etc/httpd/conf.d/.cert_created',
+        exec { 'remove_forward_vhost':
+          command   =>  "rm -Rf ${ng_forward_conf}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+        }
+
+        # create temp vhost file
+
+        exec { 'create_temp_vhost':
+          command   =>  template('cd_nagios/certbot/create_tempfile.erb'),
+          cwd       =>  '/tmp',
+          path      =>  ['/bin','/usr/bin'],
+          provider  =>  'shell',
+          creates   =>  '/etc/httpd/conf.d/.created',
+          notify    =>  Service['httpd'],
+          require   =>  Exec['remove_forward_vhost'],
+        }
+
+        # create cert
+
+        exec { 'create_cert':
+          command   =>  template($ng_get_cert_erb),
+          cwd       =>  '/tmp',
+          path      =>  ['/bin','/usr/bin'],
+          provider  =>  'shell',
+          unless    =>  template('cd_nagios/certbot/unless_get_cert.erb'),
+          notify    =>  Service['httpd'],
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['create_temp_vhost'],
+        }
+
+        # remove temp_vhost
+
+        exec { 'remove_temp_vhost':
+          command   =>  "rm -Rf ${ng_certbot_temp_file}",
+          cwd       =>  '/tmp',
+          path      =>  ['/bin','/usr/bin'],
+          provider  =>  'shell',
+          notify    =>  Service['httpd'],
+          require   =>  Exec['create_cert'],
+          creates   =>  "/etc/letsencrypt/live/${ng_nagios_server}/cert.pem",
+        }
+
+        # renew certs
+
+        exec {  'renew_cert':
+          command   =>  'certbot renew',
+          cwd       =>  '/tmp',
+          path      =>  ['/bin','/usr/bin','/opt/'],
+          provider  =>  'shell',
+          notify    =>  Service['httpd'],
+          unless    =>  template($ng_unless_renew_erb),
+        }
       }
+    }
 
-      # create temp vhost file
-
-      exec { 'create_temp_vhost':
-        command   =>  template('cd_nagios/certbot/create_tempfile.erb'),
-        cwd       =>  '/tmp',
-        path      =>  ['/bin','/usr/bin'],
-        provider  =>  'shell',
-        creates   =>  '/etc/httpd/conf.d/.created',
-        notify    =>  Service['httpd'],
-      }
-
-      # create cert
-
-      exec { 'create_cert':
-        command   =>  template($ng_get_cert_erb),
-        cwd       =>  '/tmp',
-        path      =>  ['/bin','/usr/bin'],
-        provider  =>  'shell',
-        unless    =>  template('cd_nagios/certbot/unless_get_cert.erb'),
-        notify    =>  Service['httpd'],
-        creates   =>  '/etc/httpd/conf.d/.cert_created',
-      }
-
-      # remove temp_vhost
-
-      exec { 'remove_temp_vhost':
-        command   =>  "rm -Rf ${ng_certbot_temp_file}",
-        cwd       =>  '/tmp',
-        path      =>  ['/bin','/usr/bin'],
-        provider  =>  'shell',
-        notify    =>  Service['httpd'],
-        require   =>  Exec['create_cert'],
-        creates   =>  "/etc/letsencrypt/live/${ng_nagios_server}/cert.pem",
-      }
-
-      # renew certs
-
-      exec {  'renew_cert':
-        command   =>  'certbot renew',
-        cwd       =>  '/tmp',
-        path      =>  ['/bin','/usr/bin','/opt/'],
-        provider  =>  'shell',
-        notify    =>  Service['httpd'],
-        unless    =>  template($ng_unless_renew_erb),
-      }
+    else {
+      # do nothing as we are not using https and certbot is not required then
     }
   }
 }
    @@ -268,7 +284,7 @@ class cd_nagios::certbot::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html index 3824b22..aaf75aa 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -368,7 +368,7 @@ class cd_nagios::client::target ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index 73bc277..f616e46 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index 8174853..8544b85 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -187,7 +187,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index 2b9fdee..2b94de6 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 6cd79ad..4f9458c 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index c068e14..2c998b9 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 972cdf8..e8dbcad 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -2313,7 +2313,7 @@ $ng_certbot_temp_file = '/etc/httpd/conf.d/certbot_temp.conf' diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index c630b99..8079307 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -249,7 +249,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index b5388f0..25f8e45 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -195,7 +195,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index 7f375d6..6678e28 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -452,7 +452,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index ad5dd36..d000904 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -174,7 +174,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index ee562d0..c4418eb 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index b4500f0..203cc45 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 10741c6eacd385f08461718e8308cdd762ef998f Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 21 Jul 2017 17:46:57 +0200 Subject: [PATCH 20/26] recommit for updates in build 38 --- CHANGELOG.md | 10 ++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html | 18 ++- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 118 +++++++++--------- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 19 files changed, 103 insertions(+), 75 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d05fe8..177b611 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +919531809c41d5a Jenkins Server 2017-07-21 15:24:59 +

    +

    recommit for updates in build 37

    + +

    +8db53dcf334af1b Arne Teuke 2017-07-21 15:24:35 +

    +

    re-ordering

    + +

    abeba0589d446de Jenkins Server 2017-07-21 15:18:35

    recommit for updates in build 36

    diff --git a/doc/_index.html b/doc/_index.html index 9e9640a..287db70 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -186,7 +186,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index ba17304..ec778fc 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -304,7 +304,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 58426ca..ea50e11 100644 --- a/doc/index.html +++ b/doc/index.html @@ -304,7 +304,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 6109d71..e36d674 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html index d6ab931..888eb0c 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html @@ -200,7 +200,13 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    91 92 93 -94 +94 +95 +96 +97 +98 +99 +100 
    # File 'manifests/certbot/config.pp', line 23
@@ -222,6 +228,12 @@ class cd_nagios::certbot::config (
           creates   =>  '/etc/httpd/conf.d/.cert_created',
         }
 
+        exec { 'remove_nagios_conf':
+          command   =>  "rm -Rf ${ng_nagios_conf}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_forward_vhost'],
+        }
+
         # create temp vhost file
 
         exec { 'create_temp_vhost':
@@ -231,7 +243,7 @@ class cd_nagios::certbot::config (
           provider  =>  'shell',
           creates   =>  '/etc/httpd/conf.d/.created',
           notify    =>  Service['httpd'],
-          require   =>  Exec['remove_forward_vhost'],
+          require   =>  Exec['remove_nagios_conf'],
         }
 
         # create cert
@@ -284,7 +296,7 @@ class cd_nagios::certbot::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index aaf75aa..6550dfd 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index f616e46..71f05ac 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index 8544b85..96d8475 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index 2b94de6..711662a 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 4f9458c..20a3649 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 2c998b9..45950ff 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index e8dbcad..0b671f8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -2313,7 +2313,7 @@ $ng_certbot_temp_file = '/etc/httpd/conf.d/certbot_temp.conf'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 8079307..6bbb2d1 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index 25f8e45..1fd0278 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 6678e28..4ed64f9 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -284,7 +284,10 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 175
 176
 177
-178
    +178 +179 +180 +181 
    # File 'manifests/server/files.pp', line 23
@@ -294,49 +297,36 @@ class cd_nagios::server::files (
 ) inherits cd_nagios::params {
 
   if $::fqdn == $ng_nagios_server {
-    if $ng_enable_certbot == true {
-      require cd_nagios::certbot::config
-      require cd_nagios::main::dirs
+    if $ng_use_https == true {
+      if $ng_enable_certbot == true {
 
-      # manage nagios.cfg
+        require cd_nagios::certbot::config
+        require cd_nagios::main::dirs
+
+        # manage nagios.cfg
 
 
-      # manage cgi.cfg
+        # manage cgi.cfg
 
-      file { $ng_cgi_cfg_file:
-        ensure    =>  file,
-        path      =>  $ng_cgi_cfg_file,
-        owner     =>  'root',
-        group     =>  'root',
-        mode      =>  '0644',
-        selrange  =>  s0,
-        selrole   =>  object_r,
-        seltype   =>  nagios_etc_t,
-        seluser   =>  system_u,
-        content   =>  template($ng_cgi_cfg_erb),
-        notify    =>  Service[$ng_service],
-      }
-
-      # manage nagios.conf for httpd
-
-      file { $ng_nagios_conf:
-        ensure    =>  file,
-        path      =>  $ng_nagios_conf,
-        owner     =>  'root',
-        group     =>  'root',
-        mode      =>  '0644',
-        selrange  =>  s0,
-        selrole   =>  object_r,
-        seltype   =>  httpd_config_t,
-        seluser   =>  system_u,
-        content   =>  template($ng_nagios_conf_erb),
-        notify    =>  Service[$ae_service],
-      }
-
-      if $ng_http_https_fw == true {
-        file { $ng_forward_conf:
+        file { $ng_cgi_cfg_file:
           ensure    =>  file,
-          path      =>  $ng_forward_conf,
+          path      =>  $ng_cgi_cfg_file,
+          owner     =>  'root',
+          group     =>  'root',
+          mode      =>  '0644',
+          selrange  =>  s0,
+          selrole   =>  object_r,
+          seltype   =>  nagios_etc_t,
+          seluser   =>  system_u,
+          content   =>  template($ng_cgi_cfg_erb),
+          notify    =>  Service[$ng_service],
+        }
+
+        # manage nagios.conf for httpd
+
+        file { $ng_nagios_conf:
+          ensure    =>  file,
+          path      =>  $ng_nagios_conf,
           owner     =>  'root',
           group     =>  'root',
           mode      =>  '0644',
@@ -344,26 +334,42 @@ class cd_nagios::server::files (
           selrole   =>  object_r,
           seltype   =>  httpd_config_t,
           seluser   =>  system_u,
-          content   =>  template($ng_forward_conf_erb),
+          content   =>  template($ng_nagios_conf_erb),
           notify    =>  Service[$ae_service],
         }
-      }
 
-      # manage welcome.conf for nagios web server
+        if $ng_http_https_fw == true {
+          file { $ng_forward_conf:
+            ensure    =>  file,
+            path      =>  $ng_forward_conf,
+            owner     =>  'root',
+            group     =>  'root',
+            mode      =>  '0644',
+            selrange  =>  s0,
+            selrole   =>  object_r,
+            seltype   =>  httpd_config_t,
+            seluser   =>  system_u,
+            content   =>  template($ng_forward_conf_erb),
+            notify    =>  Service[$ae_service],
+          }
+        }
 
-      if $ng_disable_welcome == true {
-        file { $ng_welcome_conf:
-          ensure    =>  file,
-          path      =>  $ng_welcome_conf,
-          owner     =>  'root',
-          group     =>  'root',
-          mode      =>  '0644',
-          selrange  =>  s0,
-          selrole   =>  object_r,
-          seltype   =>  httpd_config_t,
-          seluser   =>  system_u,
-          content   =>  template($ng_welcome_conf_erb),
-          notify    =>  Service[$ae_service],
+        # manage welcome.conf for nagios web server
+
+        if $ng_disable_welcome == true {
+          file { $ng_welcome_conf:
+            ensure    =>  file,
+            path      =>  $ng_welcome_conf,
+            owner     =>  'root',
+            group     =>  'root',
+            mode      =>  '0644',
+            selrange  =>  s0,
+            selrole   =>  object_r,
+            seltype   =>  httpd_config_t,
+            seluser   =>  system_u,
+            content   =>  template($ng_welcome_conf_erb),
+            notify    =>  Service[$ae_service],
+          }
         }
       }
     }
@@ -452,7 +458,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index d000904..015ee17 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index c4418eb..646a425 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 203cc45..8a49ac2 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 7fff54ce74927d9a9c8b4c60230edd3a77116b74 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Fri, 21 Jul 2017 18:11:57 +0200
Subject: [PATCH 21/26] recommit for updates in build 40

---
 CHANGELOG.md                                  |  10 +
 REPOSTRUCTURE.md                              |   2 +-
 doc/_index.html                               |   2 +-
 doc/file.README.html                          |   2 +-
 doc/index.html                                |   2 +-
 doc/puppet_classes/cd_nagios.html             |   2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html   |  78 +-----
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |   2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |   2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html |  57 ++--
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |   2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     | 252 +++++-------------
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |   2 +-
 doc/top-level-namespace.html                  |   2 +-
 tests/UTF_Files                               |   1 +
 21 files changed, 126 insertions(+), 304 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 177b611..fdec853 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+10741c6eacd385f Jenkins Server 2017-07-21 15:46:57
+
    
+
    recommit for updates in build 38
    
+
+
    
+09372f68657c04b Arne Teuke 2017-07-21 15:46:40
+
    
+
    removing all final config files on certbot level
    
+
+
    
 919531809c41d5a Jenkins Server 2017-07-21 15:24:59
 
    
 
    recommit for updates in build 37
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index b258133..79c14a1 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -54,12 +54,12 @@
 |   `-- params.pp
 |-- templates
 |   |-- certbot
-|   |   |-- create_tempfile.erb
 |   |   |-- get_cert.erb
 |   |   |-- unless_get_cert.erb
 |   |   `-- unless_renew_cert.erb
 |   |-- httpd
 |   |   |-- forward_conf.erb
+|   |   |-- index_html.erb
 |   |   |-- nagios_conf.erb
 |   |   `-- welcome_conf.erb
 |   |-- nagios
diff --git a/doc/_index.html b/doc/_index.html
index 287db70..5adf359 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -186,7 +186,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index ec778fc..3a774f8 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index ea50e11..16a34f1 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index e36d674..e5bf056 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
index 888eb0c..c26eed5 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
@@ -169,44 +169,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 60
 61
 62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
    +63 
    # File 'manifests/certbot/config.pp', line 23
@@ -221,31 +184,6 @@ class cd_nagios::certbot::config (
 
         require cd_certbot
 
-        # ensure there is no forward vhost file
-
-        exec { 'remove_forward_vhost':
-          command   =>  "rm -Rf ${ng_forward_conf}",
-          creates   =>  '/etc/httpd/conf.d/.cert_created',
-        }
-
-        exec { 'remove_nagios_conf':
-          command   =>  "rm -Rf ${ng_nagios_conf}",
-          creates   =>  '/etc/httpd/conf.d/.cert_created',
-          require   =>  Exec['remove_forward_vhost'],
-        }
-
-        # create temp vhost file
-
-        exec { 'create_temp_vhost':
-          command   =>  template('cd_nagios/certbot/create_tempfile.erb'),
-          cwd       =>  '/tmp',
-          path      =>  ['/bin','/usr/bin'],
-          provider  =>  'shell',
-          creates   =>  '/etc/httpd/conf.d/.created',
-          notify    =>  Service['httpd'],
-          require   =>  Exec['remove_nagios_conf'],
-        }
-
         # create cert
 
         exec { 'create_cert':
@@ -259,18 +197,6 @@ class cd_nagios::certbot::config (
           require   =>  Exec['create_temp_vhost'],
         }
 
-        # remove temp_vhost
-
-        exec { 'remove_temp_vhost':
-          command   =>  "rm -Rf ${ng_certbot_temp_file}",
-          cwd       =>  '/tmp',
-          path      =>  ['/bin','/usr/bin'],
-          provider  =>  'shell',
-          notify    =>  Service['httpd'],
-          require   =>  Exec['create_cert'],
-          creates   =>  "/etc/letsencrypt/live/${ng_nagios_server}/cert.pem",
-        }
-
         # renew certs
 
         exec {  'renew_cert':
@@ -296,7 +222,7 @@ class cd_nagios::certbot::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index 6550dfd..f810268 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 71f05ac..94df1c2 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index 96d8475..7cd5a10 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index 711662a..42c0f87 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 20a3649..9175c7b 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 45950ff..436244e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 0b671f8..ef8811a 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -1860,27 +1860,6 @@ choose '0.0.0.0/0'
    
       
     
   
-    
  • 
-      
-        ng_disable_welcome
-      
-      
-        (boolean)
-      
-      
-        (defaults to: true)
-      
-      
-        —
-        
    
-
    Whether the regular welcome screen should
-be disabled. this is required for
-the nagios http check on the nagios server
- to be successful.
    
-
    
-      
-    
    • 
-  
     
  • 
       
         ng_enable_certbot
@@ -1914,7 +1893,7 @@ certificate management
    
         —
         
    
 
    the path for certbot to place
-challenges for teh certification process.
    
+challenges for the certification process.
    
 
    
       
     
    • 
@@ -1935,6 +1914,26 @@ challenges for teh certification process.
    
 
    email address to receive administrative mail.
 used for nagios itself as
 well as for certbot.
    
+
+      
+    
+  
+    
  • 
+      
+        ng_enable_index
+      
+      
+        (boolean)
+      
+      
+        (defaults to: true)
+      
+      
+        —
+        
    
+
    Whether to create an index file to allow
+httpd checks with nagios on the
+nagios server.
    
 
    
       
     
    • 
@@ -1956,6 +1955,7 @@ well as for certbot.
    
         
     
 
+212
 213
 214
 215
@@ -2127,11 +2127,10 @@ well as for certbot.
    
 381
 382
 383
-384
-385
    
+384
    - 
    # File 'manifests/params.pp', line 213
+        
    # File 'manifests/params.pp', line 212
 
 class cd_nagios::params (
 
@@ -2243,7 +2242,7 @@ $ng_use_selinux_tools = true,
 # httpd
 $ng_required_hosts    = '',
 $ng_required_ips      = '127.0.0.0/8',
-$ng_disable_welcome   = true,
+$ng_enable_index      = true,
 
 # certbot
 $ng_enable_certbot    = true,
@@ -2298,8 +2297,8 @@ $ng_forward_conf_erb  = 'cd_nagios/httpd/forward_conf.erb'
 $ng_get_cert_erb      = 'cd_nagios/certbot/get_cert.erb'
 $ng_unless_get_cert   = 'cd_nagios/certbot/unless_get_cert.erb'
 $ng_unless_renew_erb  = 'cd_nagios/certbot/unless_renew_cert.erb'
-$ng_create_tempvhost  = 'cd_nagios/certbot/create_tempfile.erb'
-$ng_certbot_temp_file = '/etc/httpd/conf.d/certbot_temp.conf'
+$ng_index_html_file   = '/var/www/html/index.html'
+$ng_index_html_erb    = 'cd_nagios/httpd/index_html.erb'
 
 # includes must be last
 
@@ -2313,7 +2312,7 @@ $ng_certbot_temp_file = '/etc/httpd/conf.d/certbot_temp.conf'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 6bbb2d1..0d12d12 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index 1fd0278..63ff744 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 4ed64f9..4f50930 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -230,64 +230,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 121
 122
 123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
    
+124
    # File 'manifests/server/files.pp', line 23
@@ -301,107 +244,68 @@ class cd_nagios::server::files (
       if $ng_enable_certbot == true {
 
         require cd_nagios::certbot::config
-        require cd_nagios::main::dirs
 
-        # manage nagios.cfg
-
-
-        # manage cgi.cfg
-
-        file { $ng_cgi_cfg_file:
-          ensure    =>  file,
-          path      =>  $ng_cgi_cfg_file,
-          owner     =>  'root',
-          group     =>  'root',
-          mode      =>  '0644',
-          selrange  =>  s0,
-          selrole   =>  object_r,
-          seltype   =>  nagios_etc_t,
-          seluser   =>  system_u,
-          content   =>  template($ng_cgi_cfg_erb),
-          notify    =>  Service[$ng_service],
-        }
-
-        # manage nagios.conf for httpd
-
-        file { $ng_nagios_conf:
-          ensure    =>  file,
-          path      =>  $ng_nagios_conf,
-          owner     =>  'root',
-          group     =>  'root',
-          mode      =>  '0644',
-          selrange  =>  s0,
-          selrole   =>  object_r,
-          seltype   =>  httpd_config_t,
-          seluser   =>  system_u,
-          content   =>  template($ng_nagios_conf_erb),
-          notify    =>  Service[$ae_service],
-        }
-
-        if $ng_http_https_fw == true {
-          file { $ng_forward_conf:
-            ensure    =>  file,
-            path      =>  $ng_forward_conf,
-            owner     =>  'root',
-            group     =>  'root',
-            mode      =>  '0644',
-            selrange  =>  s0,
-            selrole   =>  object_r,
-            seltype   =>  httpd_config_t,
-            seluser   =>  system_u,
-            content   =>  template($ng_forward_conf_erb),
-            notify    =>  Service[$ae_service],
-          }
-        }
-
-        # manage welcome.conf for nagios web server
-
-        if $ng_disable_welcome == true {
-          file { $ng_welcome_conf:
-            ensure    =>  file,
-            path      =>  $ng_welcome_conf,
-            owner     =>  'root',
-            group     =>  'root',
-            mode      =>  '0644',
-            selrange  =>  s0,
-            selrole   =>  object_r,
-            seltype   =>  httpd_config_t,
-            seluser   =>  system_u,
-            content   =>  template($ng_welcome_conf_erb),
-            notify    =>  Service[$ae_service],
-          }
-        }
       }
     }
 
-  else {
-
     require cd_nagios::main::dirs
 
-      # manage nagios.cfg
+    # manage nagios.cfg
+
+    # manage cgi.cfg
+
+    file { $ng_cgi_cfg_file:
+      ensure    =>  file,
+      path      =>  $ng_cgi_cfg_file,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+      content   =>  template($ng_cgi_cfg_erb),
+      notify    =>  Service[$ng_service],
+    }
+
+    # manage nagios.conf for httpd
+
+    file { $ng_nagios_conf:
+      ensure    =>  file,
+      path      =>  $ng_nagios_conf,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  httpd_config_t,
+      seluser   =>  system_u,
+      content   =>  template($ng_nagios_conf_erb),
+      notify    =>  Service[$ae_service],
+    }
+
+    # manage welcome.conf for nagios web server
+
+    file { $ng_welcome_conf:
+      ensure    =>  file,
+      path      =>  $ng_welcome_conf,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  httpd_config_t,
+      seluser   =>  system_u,
+      content   =>  template($ng_welcome_conf_erb),
+      notify    =>  Service[$ae_service],
+    }
 
 
-      # manage cgi.cfg
+    if $ng_http_https_fw == true {
 
-      file { $ng_cgi_cfg_file:
+      file { $ng_forward_conf:
         ensure    =>  file,
-        path      =>  $ng_cgi_cfg_file,
-        owner     =>  'root',
-        group     =>  'root',
-        mode      =>  '0644',
-        selrange  =>  s0,
-        selrole   =>  object_r,
-        seltype   =>  nagios_etc_t,
-        seluser   =>  system_u,
-        content   =>  template($ng_cgi_cfg_erb),
-        notify    =>  Service[$ng_service],
-      }
-
-      # manage nagios.conf for httpd
-
-      file { $ng_nagios_conf:
-        ensure    =>  file,
-        path      =>  $ng_nagios_conf,
+        path      =>  $ng_forward_conf,
         owner     =>  'root',
         group     =>  'root',
         mode      =>  '0644',
@@ -409,44 +313,26 @@ class cd_nagios::server::files (
         selrole   =>  object_r,
         seltype   =>  httpd_config_t,
         seluser   =>  system_u,
-        content   =>  template($ng_nagios_conf_erb),
+        content   =>  template($ng_forward_conf_erb),
         notify    =>  Service[$ae_service],
       }
+    }
 
-      if $ng_http_https_fw == true {
 
-        file { $ng_forward_conf:
-          ensure    =>  file,
-          path      =>  $ng_forward_conf,
-          owner     =>  'root',
-          group     =>  'root',
-          mode      =>  '0644',
-          selrange  =>  s0,
-          selrole   =>  object_r,
-          seltype   =>  httpd_config_t,
-          seluser   =>  system_u,
-          content   =>  template($ng_forward_conf_erb),
-          notify    =>  Service[$ae_service],
-        }
-      }
+    if $ng_enable_index == true {
 
-      # manage welcome.conf for nagios web server
-
-      if $ng_disable_welcome == true {
-
-        file { $ng_welcome_conf:
-          ensure    =>  file,
-          path      =>  $ng_welcome_conf,
-          owner     =>  'root',
-          group     =>  'root',
-          mode      =>  '0644',
-          selrange  =>  s0,
-          selrole   =>  object_r,
-          seltype   =>  httpd_config_t,
-          seluser   =>  system_u,
-          content   =>  template($ng_welcome_conf_erb),
-          notify    =>  Service[$ae_service],
-        }
+      file { $ng_index_html_file:
+        ensure    =>  file,
+        path      =>  $ng_index_html_file,
+        owner     =>  'root',
+        group     =>  'root',
+        mode      =>  '0644',
+        selrange  =>  s0,
+        selrole   =>  object_r,
+        seltype   =>  httpd_config_t,
+        seluser   =>  system_u,
+        content   =>  template($ng_index_html_erb),
+        notify    =>  Service[$ae_service],
       }
     }
   }
@@ -458,7 +344,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 015ee17..ddcb54a 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 646a425..067dda4 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 8a49ac2..4197551 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       
diff --git a/tests/UTF_Files b/tests/UTF_Files
index a138597..ef73186 100644
--- a/tests/UTF_Files
+++ b/tests/UTF_Files
@@ -4,3 +4,4 @@
 ./.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
+./templates/httpd/index_html.erb: empty

From d70df7efcba20a61c2834e6d1c03053e17e800d0 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Fri, 21 Jul 2017 18:15:13 +0200
Subject: [PATCH 22/26] recommit for updates in build 41

---
 CHANGELOG.md                                      | 15 +++++++++++++++
 doc/_index.html                                   |  2 +-
 doc/file.README.html                              |  2 +-
 doc/index.html                                    |  2 +-
 doc/puppet_classes/cd_nagios.html                 |  2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html       |  6 ++----
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html        |  2 +-
 .../cd_nagios_3A_3Afirewall_3A_3Aiptables.html    |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html          |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html            |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html         |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html            |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html     |  2 +-
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html       |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html  |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html         |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html       |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html        |  2 +-
 doc/top-level-namespace.html                      |  2 +-
 19 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdec853..1684a86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+7fff54ce74927d9 Jenkins Server 2017-07-21 16:11:57
+
    
+
    recommit for updates in build 40
    
+
+
    
+118a7b62ca09436 Arne Teuke 2017-07-21 16:11:42
+
    
+
    added index file
    
+
+
    
+3d60841cbcdc640 Arne Teuke 2017-07-21 16:04:53
+
    
+
    added index file
    
+
+
    
 10741c6eacd385f Jenkins Server 2017-07-21 15:46:57
 
    
 
    recommit for updates in build 38
    
diff --git a/doc/_index.html b/doc/_index.html
index 5adf359..64536e0 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -186,7 +186,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 3a774f8..6326b2a 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 16a34f1..1dcb907 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index e5bf056..4d31580 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
index c26eed5..10b43df 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
@@ -168,8 +168,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 59
 60
 61
-62
-63
    +62 
    # File 'manifests/certbot/config.pp', line 23
@@ -194,7 +193,6 @@ class cd_nagios::certbot::config (
           unless    =>  template('cd_nagios/certbot/unless_get_cert.erb'),
           notify    =>  Service['httpd'],
           creates   =>  '/etc/httpd/conf.d/.cert_created',
-          require   =>  Exec['create_temp_vhost'],
         }
 
         # renew certs
@@ -222,7 +220,7 @@ class cd_nagios::certbot::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index f810268..4a14192 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 94df1c2..8b663dc 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index 7cd5a10..cd3b54f 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index 42c0f87..fe039de 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 9175c7b..9170704 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 436244e..60ae67c 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index ef8811a..62d693e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -2312,7 +2312,7 @@ $ng_index_html_erb    = 'cd_nagios/httpd/index_html.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 0d12d12..9c4a4d9 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index 63ff744..3304267 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 4f50930..7a71794 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -344,7 +344,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index ddcb54a..fece172 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 067dda4..fe608fc 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 4197551..6b0ed0c 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 5d8c5cff034540ae55ba64ffae9e64cf6bc34863 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Fri, 21 Jul 2017 18:28:39 +0200
Subject: [PATCH 23/26] recommit for updates in build 42

---
 CHANGELOG.md                                  | 10 +++++
 doc/_index.html                               |  2 +-
 doc/file.README.html                          |  2 +-
 doc/index.html                                |  2 +-
 doc/puppet_classes/cd_nagios.html             |  2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html   | 42 ++++++++++++++++++-
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |  2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html |  2 +-
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |  2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     |  4 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |  2 +-
 doc/top-level-namespace.html                  |  2 +-
 19 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1684a86..cd63d5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+d70df7efcba20a6 Jenkins Server 2017-07-21 16:15:13
+
    
+
    recommit for updates in build 41
    
+
+
    
+910a2e4fb87c5b3 Arne Teuke 2017-07-21 16:14:54
+
    
+
    fixed relationship
    
+
+
    
 7fff54ce74927d9 Jenkins Server 2017-07-21 16:11:57
 
    
 
    recommit for updates in build 40
    
diff --git a/doc/_index.html b/doc/_index.html
index 64536e0..d46ff75 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -186,7 +186,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 6326b2a..2028b85 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 1dcb907..ba4450a 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index 4d31580..03066b4 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
index 10b43df..14774e4 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
@@ -168,7 +168,26 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 59
 60
 61
-62
    +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 
    # File 'manifests/certbot/config.pp', line 23
@@ -183,6 +202,25 @@ class cd_nagios::certbot::config (
 
         require cd_certbot
 
+        # ensure there is no forward vhost file
+
+        exec { 'remove_forward_vhost':
+          command   =>  "rm -Rf ${ng_forward_conf}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+        }
+
+        exec { 'remove_nagios_conf':
+          command   =>  "rm -Rf ${ng_nagios_conf}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_forward_vhost'],
+        }
+
+        exec { 'remove_index_html':
+          command   =>  "rm -Rf ${ng_index_html_file}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_nagios_conf'],
+        }
+
         # create cert
 
         exec { 'create_cert':
@@ -220,7 +258,7 @@ class cd_nagios::certbot::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index 4a14192..72800ad 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 8b663dc..c3fdc9f 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index cd3b54f..be31052 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index fe039de..94a2f23 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 9170704..f0c780f 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 60ae67c..b746db1 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 62d693e..c44dccc 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -2312,7 +2312,7 @@ $ng_index_html_erb    = 'cd_nagios/httpd/index_html.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 9c4a4d9..46242ad 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index 3304267..59ce5e5 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 7a71794..adb1f49 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -329,7 +329,7 @@ class cd_nagios::server::files (
         mode      =>  '0644',
         selrange  =>  s0,
         selrole   =>  object_r,
-        seltype   =>  httpd_config_t,
+        seltype   =>  httpd_sys_content_t,
         seluser   =>  system_u,
         content   =>  template($ng_index_html_erb),
         notify    =>  Service[$ae_service],
@@ -344,7 +344,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index fece172..72a1982 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index fe608fc..37a0d6a 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 6b0ed0c..9f40ac5 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 92e809e1c65f745bc361e8ebbcd6703335c6eedc Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Fri, 21 Jul 2017 18:38:00 +0200
Subject: [PATCH 24/26] recommit for updates in build 44

---
 CHANGELOG.md                                  | 15 ++++++++
 doc/_index.html                               |  2 +-
 doc/file.README.html                          |  2 +-
 doc/index.html                                |  2 +-
 doc/puppet_classes/cd_nagios.html             |  2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html   | 34 +++++++++++++++++--
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |  2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html |  2 +-
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |  2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |  2 +-
 doc/top-level-namespace.html                  |  2 +-
 19 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd63d5e..3679f7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+5d8c5cff034540a Jenkins Server 2017-07-21 16:28:39
+
    
+
    recommit for updates in build 42
    
+
+
    
+72d40463456586a Arne Teuke 2017-07-21 16:28:18
+
    
+
    working with certbot still
    
+
+
    
+0a36dcedf351d57 Arne Teuke 2017-07-21 16:22:31
+
    
+
    fixed seltype
    
+
+
    
 d70df7efcba20a6 Jenkins Server 2017-07-21 16:15:13
 
    
 
    recommit for updates in build 41
    
diff --git a/doc/_index.html b/doc/_index.html
index d46ff75..4f9547e 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -186,7 +186,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 2028b85..45b3003 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index ba4450a..33f3710 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index 03066b4..a17e2f3 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
index 14774e4..e7ee00d 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
@@ -187,7 +187,22 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 78
 79
 80
-81
    +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 
    # File 'manifests/certbot/config.pp', line 23
@@ -219,6 +234,14 @@ class cd_nagios::certbot::config (
           command   =>  "rm -Rf ${ng_index_html_file}",
           creates   =>  '/etc/httpd/conf.d/.cert_created',
           require   =>  Exec['remove_nagios_conf'],
+          notify    =>  Service[$ae_service],
+        }
+
+        exec { 'disable_selinux_temporarily':
+          command   =>  'setenforce 0',
+          path      =>  ['/usr/sbin'],
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_index_html'],
         }
 
         # create cert
@@ -233,6 +256,13 @@ class cd_nagios::certbot::config (
           creates   =>  '/etc/httpd/conf.d/.cert_created',
         }
 
+        exec { 'enable_selinux':
+          command   =>  'setenforce 1',
+          path      =>  ['/usr/sbin'],
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['create_cert'],
+        }
+
         # renew certs
 
         exec {  'renew_cert':
@@ -258,7 +288,7 @@ class cd_nagios::certbot::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index 72800ad..dbd5992 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index c3fdc9f..e8070f8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index be31052..4bad3fd 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index 94a2f23..a67d72e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index f0c780f..ed90bb6 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index b746db1..61b8ad7 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index c44dccc..0320b58 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -2312,7 +2312,7 @@ $ng_index_html_erb    = 'cd_nagios/httpd/index_html.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 46242ad..ab6e44d 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index 59ce5e5..d1cfc0d 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index adb1f49..ce6f5c5 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -344,7 +344,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 72a1982..0904a2b 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 37a0d6a..ec6c185 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 9f40ac5..47d404a 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 500c46fa1cae78dec53968dcf09e9b55f67260f3 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sat, 22 Jul 2017 13:38:55 +0200
Subject: [PATCH 25/26] recommit for updates in build 46

---
 CHANGELOG.md                                  |  15 +
 REPOSTRUCTURE.md                              |   2 +-
 doc/_index.html                               |   4 +-
 doc/file.README.html                          |   2 +-
 doc/index.html                                |   2 +-
 doc/puppet_class_list.html                    |   4 +-
 doc/puppet_classes/cd_nagios.html             |   2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Acerts.html    | 300 ++++++++++++++++++
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |   2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |  24 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |   2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html |  44 ++-
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |   2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |   2 +-
 doc/top-level-namespace.html                  |   2 +-
 21 files changed, 385 insertions(+), 36 deletions(-)
 create mode 100644 doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3679f7d..0150434 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+92e809e1c65f745 Jenkins Server 2017-07-21 16:38:00
+
    
+
    recommit for updates in build 44
    
+
+
    
+35150e65ab10a1c Arne Teuke 2017-07-21 16:37:42
+
    
+
    syntax
    
+
+
    
+72d8f34299acd31 Arne Teuke 2017-07-21 16:34:48
+
    
+
    adding selinux control
    
+
+
    
 5d8c5cff034540a Jenkins Server 2017-07-21 16:28:39
 
    
 
    recommit for updates in build 42
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 79c14a1..da7b7d0 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -33,7 +33,7 @@
 |   `-- top-level-namespace.html
 |-- manifests
 |   |-- certbot
-|   |   `-- config.pp
+|   |   `-- certs.pp
 |   |-- client
 |   |   `-- target.pp
 |   |-- firewall
diff --git a/doc/_index.html b/doc/_index.html
index 4f9547e..a39bef2 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -74,7 +74,7 @@
             
     
             
  • 
-      cd_nagios::certbot::config
+      cd_nagios::certbot::certs
       
             
    • 
     
@@ -186,7 +186,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 45b3003..d54d745 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 33f3710..41991e4 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index 898b58e..53a29cd 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -47,9 +47,9 @@
     
     
 
-    
  • 
+    
  • 
       
    
-        cd_nagios::certbot::config
+        cd_nagios::certbot::certs
       
    
     
    • 
     
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index a17e2f3..a2523cf 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
new file mode 100644
index 0000000..9acbada
--- /dev/null
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
@@ -0,0 +1,300 @@
+
+
+  
+    
+
+
+  Puppet Class: cd_nagios::certbot::certs
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: cd_nagios::certbot::certs
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    cd_nagios::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/certbot/certs.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages all configuration files required for cd_nagios.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::certbot::certs.pp
+Module name: cd_nagios
+Author: Arne Teuke
+(arne_teuke@ConfDroid.com)
    
+
+
    License:
    
+
+
    This file is part of cd_nagios.
    
+
+
    cd_nagios is used for providing automatic configuration of Nagios
+
+Copyright (C) 2016 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/.
    
+
+  
    
+
    
+
    
+  
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
    
+          		
+        
    # File 'manifests/certbot/certs.pp', line 23
+
+class cd_nagios::certbot::certs (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+    if $ng_use_https == true {
+      if $ng_enable_certbot == true {
+
+        require cd_certbot
+        require cd_apache
+
+        # ensure there is no forward vhost file
+
+        exec { 'remove_forward_vhost':
+          command   =>  "rm -Rf ${ng_forward_conf}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+        }
+
+        exec { 'remove_nagios_conf':
+          command   =>  "rm -Rf ${ng_nagios_conf}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_forward_vhost'],
+        }
+
+        exec { 'remove_index_html':
+          command   =>  "rm -Rf ${ng_index_html_file}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_nagios_conf'],
+          notify    =>  Service[$ae_service],
+        }
+
+        exec { 'disable_selinux_temporarily':
+          command   =>  'setenforce 0',
+          path      =>  ['/usr/sbin'],
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_index_html'],
+        }
+
+        # create cert
+
+        exec { 'create_cert':
+          command   =>  template($ng_get_cert_erb),
+          cwd       =>  '/tmp',
+          path      =>  ['/bin','/usr/bin'],
+          provider  =>  'shell',
+          unless    =>  template('cd_nagios/certbot/unless_get_cert.erb'),
+          notify    =>  Service['httpd'],
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+        }
+
+        exec { 'enable_selinux':
+          command   =>  'setenforce 1',
+          path      =>  ['/usr/sbin'],
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['create_cert'],
+        }
+
+        # renew certs
+
+        exec {  'renew_cert':
+          command   =>  'certbot renew',
+          cwd       =>  '/tmp',
+          path      =>  ['/bin','/usr/bin','/opt/'],
+          provider  =>  'shell',
+          notify    =>  Service['httpd'],
+          unless    =>  template($ng_unless_renew_erb),
+        }
+      }
+    }
+
+    else {
+      # do nothing as we are not using https and certbot is not required then
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index dbd5992..7ff66c8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index e8070f8..d7b66d0 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index 4bad3fd..5655755 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -152,7 +152,11 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 43
 44
 45
-46
    +46 +47 +48 +49 +50 
    # File 'manifests/main/config.pp', line 24
@@ -164,14 +168,18 @@ class cd_nagios::main::config (
   # manage server configuration
 
   if $::fqdn == $ng_nagios_server {
-    include cd_nagios::server::service
+#    include cd_nagios::server::service
 
-    if $ng_include_fw == true {
-      include cd_nagios::firewall::iptables
-    }
+#    if $ng_include_fw == true {
+#      include cd_nagios::firewall::iptables
+#    }
 
-    if $ng_use_selinux_tools == true {
-      include cd_nagios::selinux::config
+#    if $ng_use_selinux_tools == true {
+#      include cd_nagios::selinux::config
+#    }
+
+    if $ng_enable_certbot == true {
+      require cd_nagios::certbot::certs
     }
   }
 
@@ -187,7 +195,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index a67d72e..76a2201 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index ed90bb6..53b933c 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 61b8ad7..e28c0fe 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 0320b58..41b91e6 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -77,9 +77,9 @@
       
       cd_nagios::server::files
    
       
-      cd_nagios::client::target
    
+      cd_nagios::certbot::certs
    
       
-      cd_nagios::certbot::config
    
+      cd_nagios::client::target
    
       
       cd_nagios::selinux::config
    
       
@@ -1934,6 +1934,30 @@ well as for certbot.
    
 
    Whether to create an index file to allow
 httpd checks with nagios on the
 nagios server.
    
+
+      
+    
+  
+    
  • 
+      
+        ng_webserver_name
+      
+      
+        (string)
+      
+      
+        (defaults to: "nagios.${::domain}")
+      
+      
+        —
+        
    
+
    the name of the web server nagios should
+listen to, i.e.
+'nagios.example.net'. Unlike ng_nagios_server,
+this
+should not be the FQDN of the nagios host, but a web server domain
+name.
+required for certbot and used in the web templates.
    
 
    
       
     
    • 
@@ -1955,10 +1979,6 @@ nagios server.
    
         
     
 
-212
-213
-214
-215
 216
 217
 218
@@ -2127,10 +2147,15 @@ nagios server.
    
 381
 382
 383
-384
    
+384
+385
+386
+387
+388
+389
    - 
    # File 'manifests/params.pp', line 212
+        
    # File 'manifests/params.pp', line 216
 
 class cd_nagios::params (
 
@@ -2247,6 +2272,7 @@ $ng_enable_index      = true,
 # certbot
 $ng_enable_certbot    = true,
 $ng_certbot_cert_path = '/var/www/html',
+$ng_webserver_name    = "nagios.${::domain}",
 
 ) {
 
@@ -2312,7 +2338,7 @@ $ng_index_html_erb    = 'cd_nagios/httpd/index_html.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index ab6e44d..7590646 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index d1cfc0d..5d2427b 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index ce6f5c5..37dcd28 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -344,7 +344,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 0904a2b..6e9a14a 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index ec6c185..7803e5f 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 47d404a..de429ee 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From d5cf3606781e1f4e77920188d3e99dc7e6333e8c Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sun, 23 Jul 2017 11:29:50 +0200
Subject: [PATCH 26/26] recommit for updates in build 49

---
 CHANGELOG.md                                  | 15 ++++
 REPOSTRUCTURE.md                              |  3 +-
 doc/_index.html                               |  2 +-
 doc/file.README.html                          |  2 +-
 doc/index.html                                |  2 +-
 doc/puppet_classes/cd_nagios.html             |  2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Acerts.html    | 74 +------------------
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |  2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      | 14 ++--
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html | 33 +++++++--
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |  2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |  2 +-
 doc/top-level-namespace.html                  |  2 +-
 20 files changed, 70 insertions(+), 99 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0150434..bdcf543 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+500c46fa1cae78d Jenkins Server 2017-07-22 11:38:55
+
    
+
    recommit for updates in build 46
    
+
+
    
+a38ace2f06f6f22 Arne Teuke 2017-07-22 11:38:36
+
    
+
    reversing steps to create cert
    
+
+
    
+d5a5afcfc3c501a Arne Teuke 2017-07-22 11:23:28
+
    
+
    reversing steps to create cert
    
+
+
    
 92e809e1c65f745 Jenkins Server 2017-07-21 16:38:00
 
    
 
    recommit for updates in build 44
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index da7b7d0..c945adf 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -9,6 +9,7 @@
 |   |   |-- full_list.js
 |   |   `-- jquery.js
 |   |-- puppet_classes
+|   |   |-- cd_nagios_3A_3Acertbot_3A_3Acerts.html
 |   |   |-- cd_nagios_3A_3Acertbot_3A_3Aconfig.html
 |   |   |-- cd_nagios_3A_3Aclient_3A_3Atarget.html
 |   |   |-- cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -78,4 +79,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-18 directories, 60 files
+18 directories, 61 files
diff --git a/doc/_index.html b/doc/_index.html
index a39bef2..00adb51 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -186,7 +186,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index d54d745..8f2ebfd 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 41991e4..9f04e40 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -304,7 +304,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index a2523cf..0f45275 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
index 9acbada..269d547 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
@@ -169,41 +169,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 60
 61
 62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
    
+63
    # File 'manifests/certbot/certs.pp', line 23
@@ -219,33 +185,6 @@ class cd_nagios::certbot::certs (
         require cd_certbot
         require cd_apache
 
-        # ensure there is no forward vhost file
-
-        exec { 'remove_forward_vhost':
-          command   =>  "rm -Rf ${ng_forward_conf}",
-          creates   =>  '/etc/httpd/conf.d/.cert_created',
-        }
-
-        exec { 'remove_nagios_conf':
-          command   =>  "rm -Rf ${ng_nagios_conf}",
-          creates   =>  '/etc/httpd/conf.d/.cert_created',
-          require   =>  Exec['remove_forward_vhost'],
-        }
-
-        exec { 'remove_index_html':
-          command   =>  "rm -Rf ${ng_index_html_file}",
-          creates   =>  '/etc/httpd/conf.d/.cert_created',
-          require   =>  Exec['remove_nagios_conf'],
-          notify    =>  Service[$ae_service],
-        }
-
-        exec { 'disable_selinux_temporarily':
-          command   =>  'setenforce 0',
-          path      =>  ['/usr/sbin'],
-          creates   =>  '/etc/httpd/conf.d/.cert_created',
-          require   =>  Exec['remove_index_html'],
-        }
-
         # create cert
 
         exec { 'create_cert':
@@ -255,14 +194,7 @@ class cd_nagios::certbot::certs (
           provider  =>  'shell',
           unless    =>  template('cd_nagios/certbot/unless_get_cert.erb'),
           notify    =>  Service['httpd'],
-          creates   =>  '/etc/httpd/conf.d/.cert_created',
-        }
-
-        exec { 'enable_selinux':
-          command   =>  'setenforce 1',
-          path      =>  ['/usr/sbin'],
-          creates   =>  '/etc/httpd/conf.d/.cert_created',
-          require   =>  Exec['create_cert'],
+          creates   =>  $ng_certbot_cert,
         }
 
         # renew certs
@@ -290,7 +222,7 @@ class cd_nagios::certbot::certs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index 7ff66c8..c21c7d7 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index d7b66d0..8ecb3f4 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index 5655755..8d12a61 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -170,13 +170,13 @@ class cd_nagios::main::config (
   if $::fqdn == $ng_nagios_server {
 #    include cd_nagios::server::service
 
-#    if $ng_include_fw == true {
-#      include cd_nagios::firewall::iptables
-#    }
+    if $ng_include_fw == true {
+      include cd_nagios::firewall::iptables
+    }
 
-#    if $ng_use_selinux_tools == true {
-#      include cd_nagios::selinux::config
-#    }
+    if $ng_use_selinux_tools == true {
+      include cd_nagios::selinux::config
+    }
 
     if $ng_enable_certbot == true {
       require cd_nagios::certbot::certs
@@ -195,7 +195,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index 76a2201..2edfd7d 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 53b933c..c8b23b6 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index e28c0fe..9d59f54 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 41b91e6..843fa47 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -1887,8 +1887,6 @@ certificate management
    
         (string)
       
       
-        (defaults to: '/var/www/html')
-      
       
         —
         
    
@@ -1962,6 +1960,19 @@ required for certbot and used in the web templates.
    
       
     
   
+    
  • 
+      
+        ng_certbot_webroot
+      
+      
+        (Any)
+      
+      
+        (defaults to: '/var/www/html')
+      
+      
+    
    • 
+  
 
 
 
@@ -2152,7 +2163,13 @@ required for certbot and used in the web templates.
    
 386
 387
 388
-389
    +389 +390 +391 +392 +393 +394 +395 
    # File 'manifests/params.pp', line 216
@@ -2271,7 +2288,7 @@ $ng_enable_index      = true,
 
 # certbot
 $ng_enable_certbot    = true,
-$ng_certbot_cert_path = '/var/www/html',
+$ng_certbot_webroot   = '/var/www/html',
 $ng_webserver_name    = "nagios.${::domain}",
 
 ) {
@@ -2326,6 +2343,12 @@ $ng_unless_renew_erb  = 'cd_nagios/certbot/unless_renew_cert.erb'
 $ng_index_html_file   = '/var/www/html/index.html'
 $ng_index_html_erb    = 'cd_nagios/httpd/index_html.erb'
 
+# certbot
+$ng_certbot_main_dir  = '/etc/letsencrypt'
+$ng_certbot_archive   = "${ng_certbot_main_dir}/archive"
+$ng_certbot_cert      = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem"
+
+
 # includes must be last
 
   include cd_nagios::main::config
@@ -2338,7 +2361,7 @@ $ng_index_html_erb    = 'cd_nagios/httpd/index_html.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 7590646..9c2554a 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index 5d2427b..c1d7829 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 37dcd28..f1255b9 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -344,7 +344,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 6e9a14a..c8afbbd 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 7803e5f..a4d5945 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index de429ee..d0f9889 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@