From 2431c59379e3aa14c6173ee1c1ca330f6389671d Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 16 May 2025 11:44:50 +0200 Subject: [PATCH 01/40] recommit for updates in build 1 --- doc/_index.html | 168 ++ doc/css/common.css | 8 + doc/css/full_list.css | 58 + doc/css/style.css | 497 +++++ doc/file.README.html | 134 ++ doc/frames.html | 22 + doc/index.html | 134 ++ doc/js/app.js | 314 +++ doc/js/full_list.js | 216 +++ doc/js/jquery.js | 4 + doc/puppet_class_list.html | 127 ++ doc/puppet_classes/puppet_cd.html | 121 ++ ...puppet_cd_3A_3Afirewall_3A_3Aiptables.html | 198 ++ .../puppet_cd_3A_3Amain_3A_3Aconfig.html | 138 ++ .../puppet_cd_3A_3Amain_3A_3Adirs.html | 154 ++ .../puppet_cd_3A_3Amain_3A_3Afiles.html | 202 ++ .../puppet_cd_3A_3Amain_3A_3Ainstall.html | 158 ++ .../puppet_cd_3A_3Amain_3A_3Auser.html | 202 ++ doc/puppet_classes/puppet_cd_3A_3Aparams.html | 1682 +++++++++++++++++ .../puppet_cd_3A_3Apuppetdb_3A_3Adirs.html | 238 +++ .../puppet_cd_3A_3Apuppetdb_3A_3Afiles.html | 344 ++++ .../puppet_cd_3A_3Apuppetdb_3A_3Aservice.html | 148 ++ .../puppet_cd_3A_3Aserver_3A_3Aservice.html | 196 ++ doc/top-level-namespace.html | 98 + 24 files changed, 5561 insertions(+) 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/puppet_cd.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Aparams.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html create mode 100644 doc/top-level-namespace.html diff --git a/doc/_index.html b/doc/_index.html new file mode 100644 index 0000000..45d5572 --- /dev/null +++ b/doc/_index.html @@ -0,0 +1,168 @@ + + + + + + + Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Documentation by YARD 0.9.36

+
+

Alphabetic Index

+ +

Puppet Class 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..eb0dbc8 --- /dev/null +++ b/doc/css/style.css @@ -0,0 +1,497 @@ +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; + box-sizing: border-box; +} + +@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..c88fef2 --- /dev/null +++ b/doc/puppet_class_list.html @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + Puppet Class List + + + +
+
+

Puppet Class List

+ + + +
+ + +
+ + diff --git a/doc/puppet_classes/puppet_cd.html b/doc/puppet_classes/puppet_cd.html new file mode 100644 index 0000000..470e95a --- /dev/null +++ b/doc/puppet_classes/puppet_cd.html @@ -0,0 +1,121 @@ + + + + + + + Puppet Class: puppet_cd + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: puppet_cd

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

Summary

+ Class initialize the puppet_cd module. + +

Overview

+
+
+ +

puppet_cd::init.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)

+ +
+
+ + + +
+ + + +
+
+ + + + +
+ 
+
+
+6
+7
+8
+ 		+ 
# File 'manifests/init.pp', line 6
+
+class puppet_cd {
+  include puppet_cd::params
+}
+
+ + + + + + + + \ No newline at end of file diff --git a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html new file mode 100644 index 0000000..86bc85d --- /dev/null +++ b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html @@ -0,0 +1,198 @@ + + + + + + + Puppet Class: puppet_cd::firewall::iptables + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: puppet_cd::firewall::iptables

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

Summary

+ Class manages firewall settings for the puppet_cd module. + +

Overview

+
+
+ +

puppet_cd::firewall::iptables.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)

+ +
+
+ + + +
+ + + +
+ + + + + +
+ 
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+ 		+ 
# File 'manifests/firewall/iptables.pp', line 6
+
+class puppet_cd::firewall::iptables (
+
+) inherits puppet_cd::params {
+  if $fqdn == $pt_pm_fqdn {
+    firewall { '38140 open port 8140':
+      proto => 'tcp',
+      dport => '8140',
+      jump  => 'accept',
+    }
+    firewall { '38443 open port 8443':
+      proto => 'tcp',
+      dport => '8443',
+      jump  => 'accept',
+    }
+  }
+
+  if $fqdn == $pt_db_fqdn {
+    if $pt_use_ssl_only != true {
+      firewall { "3${pt_no_ssl_port} open port ${pt_no_ssl_port}":
+        proto => 'tcp',
+        dport => $pt_no_ssl_port,
+        jump  => 'accept',
+      }
+      firewall { "3${pt_ssl_port} open port ${pt_ssl_port}":
+        proto => 'tcp',
+        dport => $pt_ssl_port,
+        jump  => 'accept',
+      }
+    }
+
+    if $pt_use_ssl_only == true {
+      firewall { "3${pt_ssl_port} open port ${pt_ssl_port}":
+        proto => 'tcp',
+        dport => $pt_ssl_port,
+        jump  => 'accept',
+      }
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html new file mode 100644 index 0000000..f5529a7 --- /dev/null +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html @@ -0,0 +1,138 @@ + + + + + + + Puppet Class: puppet_cd::main::config + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: puppet_cd::main::config

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

Summary

+ Class manages main logic for the puppet_cd module. + +

Overview

+
+
+ +

puppet_cd::main::config.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)

+ +
+
+ + + +
+ + + +
+ + + + + +
+ 
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+ 		+ 
# File 'manifests/main/config.pp', line 6
+
+class puppet_cd::main::config (
+
+) inherits puppet_cd::params {
+  include puppet_cd::server::service
+
+  if $pt_use_puppetdb == true {
+    include puppet_cd::puppetdb::service
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html new file mode 100644 index 0000000..2f6fb4d --- /dev/null +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html @@ -0,0 +1,154 @@ + + + + + + + Puppet Class: puppet_cd::main::dirs + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: puppet_cd::main::dirs

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

Summary

+ Class manages directories for the puppet_cd module. + +

Overview

+
+
+ +

puppet_cd::main::dirs.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)

+ +
+
+ + + +
+ + + +
+ + + + + +
+ 
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+ 		+ 
# File 'manifests/main/dirs.pp', line 6
+
+class puppet_cd::main::dirs (
+
+) inherits puppet_cd::params {
+  require puppet_cd::main::install
+
+  file { $pt_main_dir:
+    ensure   => directory,
+    path     => $pt_main_dir,
+    owner    => 'root',
+    group    => 'root',
+    mode     => '0755',
+    selrange => s0,
+    selrole  => object_r,
+    seltype  => puppet_etc_t,
+    seluser  => system_u,
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html new file mode 100644 index 0000000..9491674 --- /dev/null +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html @@ -0,0 +1,202 @@ + + + + + + + Puppet Class: puppet_cd::main::files + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: puppet_cd::main::files

+
+ +
+
Inherits:
+
puppet_cd::params
+
+ + +
+
Defined in:
+
+ manifests/main/files.pp +
+
+
+ +

Summary

+ Class manages config files for the puppet_cd module. + +

Overview

+
+
+ +

puppet_cd::main::files.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)

+ +
+
+ + + +
+ + + +
+ + + + + +
+ 
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+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/files.pp', line 6
+
+class puppet_cd::main::files (
+
+) inherits puppet_cd::params {
+  require puppet_cd::main::dirs
+
+  if $fqdn != $pt_pm_fqdn {
+    file { $pt_puppet_conf_file:
+      ensure  => file,
+      path    => $pt_puppet_conf_file,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644',
+      content => template($pt_puppet_conf_erb),
+      notify  => Service[$pt_agent_service],
+    }
+  }
+
+  if $fqdn == $pt_pm_fqdn {
+    file { $pt_puppet_conf_file:
+      ensure  => file,
+      path    => $pt_puppet_conf_file,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644',
+      content => template($pt_puppet_conf_erb),
+      notify  => Service[$pt_agent_service,$pt_server_service],
+    }
+  }
+
+  if $pt_use_puppetdb == true {
+    file { $pt_puppetdb_conf_file:
+      ensure  => filet,
+      path    => $pt_puppetdb_conf_file,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644',
+      content => template($pt_puppetdb_conf_erb),
+      notify  => Service[$pt_agent_service,$pt_server_service],
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html new file mode 100644 index 0000000..292829a --- /dev/null +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html @@ -0,0 +1,158 @@ + + + + + + + Puppet Class: puppet_cd::main::install + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: puppet_cd::main::install

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

Summary

+ Class manages package installation for the puppet_cd module. + +

Overview

+
+
+ +

puppet_cd::main::install.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)

+ +
+
+ + + +
+ + + +
+ + + + + +
+ 
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+ 		+ 
# File 'manifests/main/install.pp', line 6
+
+class puppet_cd::main::install (
+
+) inherits puppet_cd::params {
+  package { $pt_agent_pkg:
+    ensure => $pt_pkg_ensure,
+  }
+
+  if $fqdn == $pt_pm_fqdn {
+    package { $pt_server_pkg:
+      ensure => $pt_pkg_ensure,
+    }
+  }
+
+  if $fqdn == $pt_db_fqdn {
+    package { $pt_db_pkg:
+      ensure  => $pt_pkg_ensure,
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html new file mode 100644 index 0000000..94ec425 --- /dev/null +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html @@ -0,0 +1,202 @@ + + + + + + + Puppet Class: puppet_cd::main::user + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: puppet_cd::main::user

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

Summary

+ Class manages user settings for the puppet_cd module. + +

Overview

+
+
+ +

puppet_cd::main::user.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)

+ +
+
+ + + +
+ + + +
+ + + + + +
+ 
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+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/user.pp', line 6
+
+class puppet_cd::main::user (
+
+) inherits puppet_cd::params {
+  if ($fqdn == $pt_pm_fqdn) and ($pt_manage_user == true) {
+    user { $pt_user:
+      ensure     => present,
+      name       => $pt_user,
+      allowdupe  => false,
+      comment    => $pt_user_comment,
+      gid        => $pt_user,
+      managehome => true,
+      home       => $pt_user_home,
+      shell      => $pt_user_shell,
+    }
+
+    group { $pt_user:
+      ensure    => present,
+      name      => $pt_user,
+      allowdupe => false,
+    }
+  }
+
+  if ($fqdn == $pt_db_fqdn) and ($pt_manage_db_user == true) {
+    user { $pt_db_user:
+      ensure     => present,
+      name       => $pt_db_user,
+      allowdupe  => false,
+      comment    => $pt_db_user_comment,
+      gid        => $pt_db_user,
+      managehome => true,
+      home       => $pt_db_user_home,
+      shell      => $pt_db_user_shell,
+    }
+
+    group { $pt_db_user:
+      ensure    => present,
+      name      => $pt_db_user,
+      allowdupe => false,
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html new file mode 100644 index 0000000..5e9ccf1 --- /dev/null +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -0,0 +1,1682 @@ + + + + + + + Puppet Class: puppet_cd::params + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: puppet_cd::params

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

Summary

+ Class manages parameters for the puppet_cd module. + +

Overview

+
+
+ +

puppet_cd::params.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid) settings are applied. any other fqdn # will be considered a puppet agent.

+ +
+
+ + + +
+

Parameters:

+
    + +
  • + + pt_manage_fw + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether to manage firewall settings

    +
    + +
    • + +
  • + + pt_pm_fqdn + + + (String) + + + (defaults to: 'puppetmaster.example.net') + + + — +
    +

    the fqdn for the puppetmaster and master

    +
    + +
    • + +
  • + + pt_db_fqdn + + + (String) + + + (defaults to: 'puppetdb.example.net') + + + — +
    +

    the fqdn for the puppetdb host.

    +
    + +
    • + +
  • + + pt_pkg_ensure + + + (String) + + + (defaults to: 'present') + + + — +
    +

    valid: “present”, “latest”, “v1.2.3”

    +
    + +
    • + +
  • + + pt_agent_pkg + + + (String) + + + (defaults to: 'puppet-agent') + + + — +
    +

    the packages for agents to install

    +
    + +
    • + +
  • + + pt_server_pkg + + + (String) + + + (defaults to: 'puppetserver') + + + — +
    +

    the server packages to install

    +
    + +
    • + +
  • + + pt_db_pkg + + + (Array) + + + (defaults to: ['puppetdb','puppetdb-termini']) + + + — +
    +

    the packages for puppetdb

    +
    + +
    • + +
  • + + pt_no_ssl_port + + + (String) + + + (defaults to: '8080') + + + — +
    +

    non-ssl port number for puppetdb

    +
    + +
    • + +
  • + + pt_ssl_port + + + (String) + + + (defaults to: '8081') + + + — +
    +

    ssl port for puppetdb

    +
    + +
    • + +
  • + + pt_use_ssl_only + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether to use ssl only.

    +
    + +
    • + +
  • + + pt_manage_user + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether to manage the puppet user

    +
    + +
    • + +
  • + + pt_user + + + (String) + + + (defaults to: 'puppet') + + + — +
    +

    the puppet user

    +
    + +
    • + +
  • + + pt_user_comment + + + (String) + + + (defaults to: 'puppetserver daemon') + + + — +
    +

    the user comment

    +
    + +
    • + +
  • + + pt_user_home + + + (String) + + + (defaults to: '/opt/puppetlabs/server/data/puppetserver') + + + — +
    +

    the user home

    +
    + +
    • + +
  • + + pt_user_shell + + + (String) + + + (defaults to: '/sbin/nologin') + + + — +
    +

    the user shell

    +
    + +
    • + +
  • + + pt_manage_db_user + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether to manage the user for puppetdb

    +
    + +
    • + +
  • + + pt_db_user + + + (String) + + + (defaults to: 'puppetdb') + + + — +
    +

    the puppetdb user

    +
    + +
    • + +
  • + + pt_db_user_comment + + + (String) + + + (defaults to: 'PuppetDB daemon') + + + — +
    +

    the user comment for puppetdb user

    +
    + +
    • + +
  • + + pt_db_user_home + + + (String) + + + (defaults to: '/opt/puppetlabs/server/data/puppetdb') + + + — +
    +

    the user home for the puppetdb user

    +
    + +
    • + +
  • + + pt_db_user_shell + + + (String) + + + (defaults to: '/sbin/nologin') + + + — +
    +

    the shell for the puppetdb user

    +
    + +
    • + +
  • + + pt_use_puppetdb + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to use puppetdb on host

    +
    + +
    • + +
  • + + pt_environment + + + (String) + + + (defaults to: 'production') + + + — +
    +

    the environment

    +
    + +
    • + +
  • + + pt_basemodulepath + + + (String) + + + (defaults to: '/etc/puppetlabs/code/environments/common:/etc/puppetlabs/code/modules:/opt/puppetlabs/puppet/modules:/usr/share/puppet/modules') + + + — +
    +

    the base module path

    +
    + +
    • + +
  • + + pt_logdir + + + (String) + + + (defaults to: '/var/log/puppetlabs/puppet') + + + — +
    +

    the log directory

    +
    + +
    • + +
  • + + pt_allow_duplicate_certs + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to allow duplicated certs

    +
    + +
    • + +
  • + + pt_pluginfactsource + + + (String) + + + (defaults to: 'pluginfacts') + + + — +
    +

    the plugin fact source

    +
    + +
    • + +
  • + + pt_pluginsource + + + (String) + + + (defaults to: 'plugins') + + + — +
    +

    the plugin source

    +
    + +
    • + +
  • + + pt_runinterval + + + (String) + + + (defaults to: '1800') + + + — +
    +

    the runinterval

    +
    + +
    • + +
  • + + pt_reports + + + (String) + + + (defaults to: 'foreman') + + + — +
    +

    where to send the run reports

    +
    + +
    • + +
  • + + pt_show_diff + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to show the diff

    +
    + +
    • + +
  • + + pt_default_schedules + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    the default run schedules

    +
    + +
    • + +
  • + + pt_masterport + + + (String) + + + (defaults to: '8140') + + + — +
    +

    the master port to listen on

    +
    + +
    • + +
  • + + pt_noop + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether noop should be executed

    +
    + +
    • + +
  • + + pt_pluginsync + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether pluginsync should be allowed

    +
    + +
    • + +
  • + + pt_report + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether reports should be created

    +
    + +
    • + +
  • + + pt_splay + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to enable a sleeping period before runs

    +
    + +
    • + +
  • + + pt_splaylimit + + + (String) + + + (defaults to: '1800') + + + — +
    +

    the splay limit

    +
    + +
    • + +
  • + + pt_usecacheonfailure + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether to use the cache on failure

    +
    + +
    • + +
  • + + pt_autosign + + + (String) + + + (defaults to: '/etc/puppetlabs/puppet/autosign.conf') + + + — +
    +

    where to check the autosign settings

    +
    + +
    • + +
  • + + pt_ca + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether to be a ca

    +
    + +
    • + +
  • + + pt_external_nodes + + + (String) + + + (defaults to: '/etc/puppetlabs/puppet/node.rb') + + + — +
    +

    the external node settings (ENC)

    +
    + +
    • + +
  • + + pt_logdir_master + + + (String) + + + (defaults to: '/var/log/puppetlabs/puppetserver') + + + — +
    +

    the log directory on the master

    +
    + +
    • + +
  • + + pt_node_terminus + + + (String) + + + (defaults to: 'exec') + + + — +
    +

    Which node data plugin to use when compiling node catalogs.

    +
    + +
    • + +
  • + + pt_strict_variables + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    Causes an evaluation error when referencing unknown variables

    +
    + +
    • + +
  • + + pt_storeconfigs + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether store client configs.

    +
    + +
    • + +
  • + + pt_storeconfigs_backend + + + (String) + + + (defaults to: 'puppetdb') + + + — +
    +

    where to store client configs

    +
    + +
    • + +
  • + + pt_parser + + + (String) + + + (defaults to: 'current') + + + — +
    +

    which parser version to use

    +
    + +
    • + +
  • + + pt_cert_revocation + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether to check for cert revocations

    +
    + +
    • + +
  • + + pt_logging_max_file_size + + + (String) + + + (defaults to: '200MB') + + + — +
    +

    max file size for puppetdb logging

    +
    + +
    • + +
  • + + pt_logging_max_history + + + (String) + + + (defaults to: '90') + + + — +
    +

    max logging history

    +
    + +
    • + +
  • + + pt_logging_total_size + + + (String) + + + (defaults to: '1GB') + + + — +
    +

    total size of logging file

    +
    + +
    • + +
  • + + pt_com_proc_threads + + + (String) + + + (defaults to: '4') + + + — +
    +

    number of processing threads

    +
    + +
    • + +
  • + + pt_concurrent_writes + + + (String) + + + (defaults to: '4') + + + — +
    +

    max concurrent writes

    +
    + +
    • + +
  • + + pt_db_subname + + + (String) + + + (defaults to: '//localhost:5432/puppetdb') + + + — +
    +

    the db name

    +
    + +
    • + +
  • + + pt_db_username + + + (String) + + + (defaults to: 'foobar') + + + — +
    +

    the db username

    +
    + +
    • + +
  • + + pt_db_password + + + (String) + + + (defaults to: 'foobar') + + + — +
    +

    the db password

    +
    + +
    • + +
  • + + pt_gc_interval + + + (String) + + + (defaults to: '60') + + + — +
    +

    garbage collection interval (Java)

    +
    + +
    • + +
  • + + pt_log_slow_statements + + + (String) + + + (defaults to: '10') + + + — +
    +

    number of seconds before an SQL query is considered “slow.”

    +
    + +
    • + +
  • + + pt_puppetdb_source_lan + + + (String) + + + (defaults to: '0.0.0.0/0') + + + — +
    +

    the source lan for puppetdb clients

    +
    + +
    • + +
  • + + pt_soft_write_failure + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    allows the PuppetDB-termini to fail softly if PuppetDB is not accessible for command submission.

    +
    + +
    • + +
  • + + pt_no_ssl_host + + + (String) + + + (defaults to: '0.0.0.0') + + + — +
    +

    ip range for non-ssl hosts

    +
    + +
    • + +
  • + + pt_ssl_host + + + (String) + + + (defaults to: '0.0.0.0') + + + — +
    +

    ip range for SSL hosts

    +
    + +
    • + +
  • + + pt_ssl_key + + + (String) + + + (defaults to: '/etc/puppetlabs/puppetdb/ssl/private.pem') + + + — +
    +

    location of the private key

    +
    + +
    • + +
  • + + pt_ssl_cert + + + (String) + + + (defaults to: '/etc/puppetlabs/puppetdb/ssl/public.pem') + + + — +
    +

    location of the ssl cert

    +
    + +
    • + +
  • + + pt_ssl_ca_cert + + + (String) + + + (defaults to: '/etc/puppetlabs/puppetdb/ssl/ca.pem') + + + — +
    +

    location of the ssl ca cert

    +
    + +
    • + +
  • + + pt_log_access + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to configure log access

    +
    + +
    • + +
  • + + pt_access_log_config + + + (String) + + + (defaults to: '/etc/puppetlabs/puppetdb/request-logging.xml') + + + — +
    +

    the location of the access log config

    +
    + +
    • + +
  • + + pt_enable_repl + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to allow puppetdb replication

    +
    + +
    • + +
  • + + pt_repl_port + + + (String) + + + (defaults to: '8082') + + + — +
    +

    the replication port

    +
    + +
    • + +
  • + + pt_repl_host + + + (String) + + + (defaults to: '127.0.0.1') + + + — +
    +

    the replication host

    +
    + +
    • + +
+ + + +
+ + + + + +
+ 
+
+
+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
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+ 		+ 
# File 'manifests/params.pp', line 81
+
+class puppet_cd::params (
+
+  Boolean $pt_manage_fw             = true,
+  String $pt_pm_fqdn                = 'puppetmaster.example.net',
+  String $pt_db_fqdn                = 'puppetdb.example.net',
+
+  # installation
+  String $pt_pkg_ensure             = 'present',
+  String $pt_agent_pkg              = 'puppet-agent',
+  String $pt_server_pkg             = 'puppetserver',
+  Array $pt_db_pkg                  = ['puppetdb','puppetdb-termini'],
+
+  # user settings
+  ## puppet user
+  Boolean $pt_manage_user           = true,
+  String $pt_user                   = 'puppet',
+  String $pt_user_comment           = 'puppetserver daemon',
+  String $pt_user_home              = '/opt/puppetlabs/server/data/puppetserver',
+  String $pt_user_shell             = '/sbin/nologin',
+  ## puppetdb user
+  Boolean $pt_manage_db_user        = true,
+  String $pt_db_user                = 'puppetdb',
+  String $pt_db_user_comment        = 'PuppetDB daemon',
+  String $pt_db_user_home           = '/opt/puppetlabs/server/data/puppetdb',
+  String $pt_db_user_shell          = '/sbin/nologin',
+  # templates
+  ## puppet
+  String $pt_environment            = 'production',
+  Boolean $pt_allow_duplicate_certs = false,
+  String $pt_basemodulepath         = '/etc/puppetlabs/code/environments/common:/etc/puppetlabs/code/modules:/opt/puppetlabs/puppet/modules:/usr/share/puppet/modules',
+  String $pt_logdir                 = '/var/log/puppetlabs/puppet',
+  String $pt_pluginfactsource       = 'pluginfacts',
+  String $pt_pluginsource           = 'plugins',
+  String $pt_reports                = 'foreman',
+  Boolean $pt_show_diff             = false,
+  Boolean $pt_default_schedules     = false,
+  String $pt_masterport             = '8140',
+  Boolean $pt_noop                  = false,
+  Boolean $pt_pluginsync            = true,
+  Boolean $pt_report                = true,
+  String $pt_runinterval            = '1800',
+  Boolean $pt_splay                 = false,
+  String $pt_splaylimit             = '1800',
+  Boolean $pt_usecacheonfailure     = true,
+  String $pt_autosign               = '/etc/puppetlabs/puppet/autosign.conf',
+  Boolean $pt_ca                    = true,
+  String $pt_external_nodes         = '/etc/puppetlabs/puppet/node.rb',
+  String $pt_logdir_master          = '/var/log/puppetlabs/puppetserver',
+  String $pt_node_terminus          = 'exec',
+  Boolean $pt_strict_variables      = false,
+  Boolean $pt_storeconfigs          = true,
+  String $pt_storeconfigs_backend   = 'puppetdb',
+  String $pt_parser                 = 'current',
+  Boolean $pt_cert_revocation       = true,
+## puppetdb
+  Boolean $pt_use_puppetdb          = false,
+  String $pt_logging_max_file_size  = '200MB',
+  String $pt_logging_max_history     = '90',
+  String $pt_logging_total_size     = '1GB',
+  String $pt_com_proc_threads       = '4',
+  String $pt_concurrent_writes      = '4',
+  String $pt_db_subname             = '//localhost:5432/puppetdb',
+  String $pt_db_username            = 'foobar',
+  String $pt_db_password            = 'foobar',
+  String $pt_gc_interval            = '60',
+  String $pt_log_slow_statements    = '10',
+  String $pt_no_ssl_port            = '8080',
+  String $pt_ssl_port               = '8081',
+  Boolean $pt_use_ssl_only          = true,
+  String $pt_puppetdb_source_lan    = '0.0.0.0/0',
+  Boolean $pt_soft_write_failure    = false,
+  String $pt_no_ssl_host            = '0.0.0.0',
+  String $pt_ssl_host               = '0.0.0.0',
+  String $pt_ssl_key                = '/etc/puppetlabs/puppetdb/ssl/private.pem',
+  String $pt_ssl_cert               = '/etc/puppetlabs/puppetdb/ssl/public.pem',
+  String $pt_ssl_ca_cert            = '/etc/puppetlabs/puppetdb/ssl/ca.pem',
+  Boolean $pt_log_access            = false,
+  String $pt_access_log_config      = '/etc/puppetlabs/puppetdb/request-logging.xml',
+  Boolean $pt_enable_repl           = false,
+  String $pt_repl_port              = '8082',
+  String $pt_repl_host              = '127.0.0.1',
+
+) {
+  $fqdn                             = $facts['networking']['fqdn']
+
+# directories
+## puppet
+  $pt_main_dir                      = '/etc/puppetlabs'
+  $pt_puppetdir                     = "${pt_main_dir}/puppet"
+  $pt_code_dir                      = "${pt_main_dir}/code"
+  $pt_environmentspath              = "${pt_code_dir}/environments"
+  $pt_ssldir                        = "${pt_puppetdir}/ssl"
+  $pt_privatekeydir                 = "${pt_ssldir}/private_keys"
+  $pt_rundir                        = '/var/run/puppetlabs'
+  $pt_rundir_master                 = '/var/run/puppetlabs/puppetserver'
+  $pt_vardir                        = '/opt/puppetlabs/puppet/cache'
+  $pt_vardir_master                 = '/opt/puppetlabs/server/data/puppetserver'
+## puppetdb
+  $pt_puppetdb_main                 = '/etc/puppetlabs/puppetdb'
+  $pt_puppetdb_conf_d               = "${pt_puppetdb_main}/conf.d"
+  $pt_puppetdb_ssl                  = "${pt_puppetdb_main}/ssl"
+  $pt_puppetdb_log                  = '/var/log/puppetlabs/puppetdb'
+  $pt_puppetdb_var_dir              = '/opt/puppetlabs/server/data/puppetdb'
+
+# files
+## puppet
+  $pt_puppet_conf_file              = "${pt_puppetdir}/puppet.conf"
+  $pt_puppet_conf_erb               = 'puppet_cd/puppet.conf.erb'
+  $pt_agent_conf_erb                = 'puppet_cd/agent.conf.erb'
+  $pt_hiera_config                  = "${pt_puppetdir}/hiera.yaml"
+## puppetdb
+  $pt_bootstrap_conf                = "${pt_puppetdb_main}/bootstrap.cfg"
+  $pt_bootstrap_erb                 = 'cd_puppet/puppetdb/bootstrap.cfg.erb'
+  $pt_puppetdb_access_log           = "${pt_puppetdb_log}/puppetdb-access"
+  $pt_request_logging_conf          = "${pt_puppetdb_main}/request-logging.xml"
+  $pt_request_logging_erb           = 'cd_puppet/puppetdb/request_logging.xml.erb'
+  $pt_logback_conf                  = "${pt_puppetdb_main}/logback.xml"
+  $pt_logback_erb                   = 'cd_puppet/puppetdb/logback.xml.erb'
+  $pt_puppetdb_config_ini           = "${pt_puppetdb_conf_d}/config.ini"
+  $pt_puppetdb_config_erb           = 'cd_puppet/puppetdb/config.ini.erb'
+  $pt_puppetdb_database_ini         = "${pt_puppetdb_conf_d}/database.ini"
+  $pt_puppetdb_database_erb         = 'cd_puppet/puppetdb/database.ini.erb'
+  $pt_puppetdb_jetty_ini            = "${pt_puppetdb_conf_d}/jetty.ini"
+  $pt_puppetdb_jetty_erb            = 'cd_puppet/puppetdb/jetty.ini.erb'
+  $pt_puppetdb_conf_file            = "${pt_puppetdir}/puppetdb.conf"
+  $pt_puppetdb_conf_erb             = 'cd_puppet/puppetdb/puppetdb.conf.erb'
+  $pt_puppetdb_repl_ini             = "${pt_puppetdb_conf_d}/repl.ini"
+  $pt_puppetdb_repl_erb             = 'cd_puppet/puppetdb/repl.ini.erb'
+
+# service
+  $pt_server_service                = 'puppetserver'
+  $pt_agent_service                 = 'puppet'
+  $pt_db_service                    = 'puppetdb'
+
+#
+  # includes must be last
+  include puppet_cd::main::config
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html new file mode 100644 index 0000000..b0c25f1 --- /dev/null +++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html @@ -0,0 +1,238 @@ + + + + + + + Puppet Class: puppet_cd::puppetdb::dirs + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: puppet_cd::puppetdb::dirs

+
+ +
+
Inherits:
+
puppet_cd::params
+
+ + +
+
Defined in:
+
+ manifests/puppetdb/dirs.pp +
+
+
+ +

Summary

+ Class manages puppetdb directories + +

Overview

+
+
+ +

puppet_cd::puppetdb::dirs.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)

+ +
+
+ + + +
+ + + +
+ + + + + +
+ 
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+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
+ 		+ 
# File 'manifests/puppetdb/dirs.pp', line 6
+
+class puppet_cd::puppetdb::dirs (
+
+) inherits puppet_cd::params {
+  if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) {
+    require puppet_cd::main::install
+
+    # main directory
+    file { $pt_puppetdb_main:
+      ensure   => directory,
+      path     => $pt_puppetdb_main,
+      owner    => $pt_puppetdb_user,
+      group    => $pt_puppetdb_user,
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => etc_t,
+      seluser  => system_u,
+    }
+
+    # conf.d directory
+    file { $pt_puppetdb_conf_d:
+      ensure   => directory,
+      path     => $pt_puppetdb_conf_d,
+      owner    => $pt_puppetdb_user,
+      group    => $pt_puppetdb_user,
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => etc_t,
+      seluser  => system_u,
+    }
+
+    # ssl directory
+    file { $pt_puppetdb_ssl:
+      ensure   => directory,
+      path     => $pt_puppetdb_ssl,
+      owner    => $pt_puppetdb_user,
+      group    => $pt_puppetdb_user,
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => etc_t,
+      seluser  => system_u,
+    }
+
+    # log dir
+    file { $pt_puppetdb_log:
+      ensure   => directory,
+      path     => $pt_puppetdb_log,
+      owner    => $pt_puppetdb_user,
+      group    => $pt_puppetdb_user,
+      mode     => '0700',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => var_log_t,
+      seluser  => system_u,
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html new file mode 100644 index 0000000..5f82142 --- /dev/null +++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html @@ -0,0 +1,344 @@ + + + + + + + Puppet Class: puppet_cd::puppetdb::files + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: puppet_cd::puppetdb::files

+
+ +
+
Inherits:
+
puppet_cd::params
+
+ + +
+
Defined in:
+
+ manifests/puppetdb/files.pp +
+
+
+ +

Summary

+ Class manages puppetdb files + +

Overview

+
+
+ +

puppet_cd::puppetdb::files.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)

+ +
+
+ + + +
+ + + +
+ + + + + +
+ 
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+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
+ 		+ 
# File 'manifests/puppetdb/files.pp', line 6
+
+class puppet_cd::puppetdb::files (
+
+) inherits puppet_cd::params {
+  if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) {
+    require puppet_cd::puppetdb::dirs
+
+    # bootstrap.cfg
+    file { $pt_bootstrap_conf:
+      ensure   => file,
+      path     => $pt_bootstrap_conf,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0644',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+      content  => template($pt_bootstrap_erb),
+      notify   => Service[$pt_puppetdb],
+    }
+
+    # requestlogging.xml
+    file { $pt_request_logging_conf:
+      ensure   => file,
+      path     => $pt_request_logging_conf,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0644',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+      content  => template($pt_request_logging_erb),
+      notify   => Service[$pt_puppetdb],
+    }
+
+    # logback.xml
+    file { $pt_logback_conf:
+      ensure   => file,
+      path     => $pt_logback_conf,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0644',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+      content  => template($pt_logback_erb),
+      notify   => Service[$pt_puppetdb],
+    }
+
+    # config.ini
+    file { $pt_puppetdb_config_ini:
+      ensure   => file,
+      path     => $pt_puppetdb_config_ini,
+      owner    => $pt_puppetdb_user,
+      group    => $pt_puppetdb_user,
+      mode     => '0640',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+      content  => template($pt_puppetdb_config_erb),
+      notify   => Service[$pt_puppetdb],
+    }
+
+    # database.ini
+    file { $pt_puppetdb_database_ini:
+      ensure   => file,
+      path     => $pt_puppetdb_database_ini,
+      owner    => $pt_puppetdb_user,
+      group    => $pt_puppetdb_user,
+      mode     => '0640',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+      content  => template($pt_puppetdb_database_erb),
+      notify   => Service[$pt_puppetdb],
+    }
+
+    # jetty.ini
+    file { $pt_puppetdb_jetty_ini :
+      ensure   => file,
+      path     => $pt_puppetdb_jetty_ini ,
+      owner    => $pt_puppetdb_user,
+      group    => $pt_puppetdb_user,
+      mode     => '0640',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+      content  => template($pt_puppetdb_jetty_erb),
+      notify   => Service[$pt_puppetdb],
+    }
+
+    # repl.ini
+    file { $pt_puppetdb_repl_ini:
+      ensure   => file,
+      path     => $pt_puppetdb_repl_ini,
+      owner    => $pt_puppetdb_user,
+      group    => $pt_puppetdb_user,
+      mode     => '0640',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+      content  => template($pt_puppetdb_repl_erb),
+      notify   => Service[$pt_puppetdb],
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html new file mode 100644 index 0000000..70af012 --- /dev/null +++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html @@ -0,0 +1,148 @@ + + + + + + + Puppet Class: puppet_cd::puppetdb::service + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: puppet_cd::puppetdb::service

+
+ +
+
Inherits:
+
puppet_cd::params
+
+ + +
+
Defined in:
+
+ manifests/puppetdb/service.pp +
+
+
+ +

Summary

+ Class manages puppetdb service + +

Overview

+
+
+ +

puppet_cd::puppetdb::service.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)

+ +
+
+ + + +
+ + + +
+ + + + + +
+ 
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+ 		+ 
# File 'manifests/puppetdb/service.pp', line 6
+
+class puppet_cd::puppetdb::service (
+
+) inherits puppet_cd::params {
+  if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) {
+    require puppet_cd::puppetdb::files
+
+    service { $pt_puppetdb:
+      ensure     => running,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+    }
+  }
+}
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html new file mode 100644 index 0000000..98023b2 --- /dev/null +++ b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html @@ -0,0 +1,196 @@ + + + + + + + Puppet Class: puppet_cd::server::service + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Puppet Class: puppet_cd::server::service

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

Summary

+ Class manages the puppet server service for the puppet_cd module. + +

Overview

+
+
+ +

puppet_cd::server::service.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)

+ +
+
+ + + +
+ + + +
+ + + + + +
+ 
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+ 		+ 
# File 'manifests/server/service.pp', line 6
+
+class puppet_cd::server::service (
+
+) inherits puppet_cd::params {
+  require puppet_cd::main::files
+
+  # manage agent service on all nodes
+  service { $pt_agent_service:
+    ensure     => running,
+    hasstatus  => true,
+    hasrestart => true,
+    enable     => true,
+  }
+
+  # manage puppet server service
+  if $fqdn == $pt_pm_fqdn {
+    require puppet_cd::firewall::iptables
+    require puppet_cd::main::user
+
+    service { $pt_server_service:
+      ensure     => running,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+    }
+  }
+
+  # manage puppetdb service
+  if $fqdn == $pt_db_fqdn {
+    require puppet_cd::firewall::iptables
+
+    service { $pt_db_service:
+      ensure     => running,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+    }
+  }
+}
+
+
+
+ + + +
+ + \ 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..5d6b54b --- /dev/null +++ b/doc/top-level-namespace.html @@ -0,0 +1,98 @@ + + + + + + + Top Level Namespace + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Top Level Namespace + + + +

+
+ + + + + + + + + + + +
+ + + + + + + + + + +
+ + + +
+ + \ No newline at end of file From ec913bc03f1e596868d98f064d5ced594108cc0b Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 22 May 2025 18:53:59 +0200 Subject: [PATCH 02/40] Recommit for updates in build 2 --- doc/file.README.html | 2 +- doc/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/file.README.html b/doc/file.README.html index 6d6dcc6..22a8359 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -60,7 +60,7 @@

Readme

-

|

+

|

[[TOC]]

diff --git a/doc/index.html b/doc/index.html index 4c1ba7a..c7651e8 100644 --- a/doc/index.html +++ b/doc/index.html @@ -60,7 +60,7 @@

Readme

-

|

+

|

[[TOC]]

From fbeeb7a752125dfe3bee6fe9fa2901df78494229 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 21 Oct 2025 21:00:45 +0200 Subject: [PATCH 03/40] Recommit for updates in build 4 --- doc/_index.html | 10 + doc/puppet_class_list.html | 14 ++ .../puppet_cd_3A_3Amain_3A_3Aconfig.html | 12 +- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 211 +++++++++++++++--- .../puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 180 +++++++++++++++ .../puppet_cd_3A_3Ar10k_3A_3Awebhook.html | 130 +++++++++++ 6 files changed, 521 insertions(+), 36 deletions(-) create mode 100644 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html diff --git a/doc/_index.html b/doc/_index.html index 45d5572..c6d58a4 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -123,6 +123,16 @@ +
  • + puppet_cd::r10k::install + +
    • + +
  • + puppet_cd::r10k::webhook + +
    • +
  • puppet_cd::server::service diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index c88fef2..a1f97c5 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -113,6 +113,20 @@
    • +
  • +
    + puppet_cd::r10k::install +
    +
    • + + +
  • +
    + puppet_cd::r10k::webhook +
    +
    • + +
  • puppet_cd::server::service diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html index f5529a7..00f8d54 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html @@ -109,7 +109,12 @@ 11 12 13 -14 +14 +15 +16 +17 +18 +19 
    # File 'manifests/main/config.pp', line 6
@@ -122,6 +127,11 @@ class puppet_cd::main::config (
   if $pt_use_puppetdb == true {
     include puppet_cd::puppetdb::service
   }
+
+  if $pt_use_r10k == true {
+    include puppet_cd::r10k::install
+    include puppet_cd::r10k::webhook
+  }
 }
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 5e9ccf1..19a3b91 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -77,6 +77,10 @@ puppet_cd::main::install
    + puppet_cd::r10k::install
    + + puppet_cd::r10k::webhook
    + puppet_cd::puppetdb::dirs
    puppet_cd::puppetdb::files
    @@ -242,6 +246,24 @@
    • +
  • + + pt_r10k_pkg + + + (Array) + + + (defaults to: ['ruby','ruby-devel']) + + + — +
    +

    the packages for r10k to install

    +
    + +
    • +
  • pt_no_ssl_port @@ -296,24 +318,6 @@
    • -
  • - - pt_manage_user - - - (Boolean) - - - (defaults to: true) - - - — -
    -

    whether to manage the puppet user

    -
    - -
    • -
  • pt_user @@ -1376,6 +1380,109 @@
    • +
  • + + pt_use_r10k + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to use r10k service

    +
    + +
    • + +
  • + + pt_use_r10k_webhook + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to use r10k webhook service

    +
    + +
    • + +
  • + + pt_r10k_remote + + + (String) + + + (defaults to: 'git@gitlab.example.net/repo.git') + + + — +
    +

    the remote url for the r10k control repo

    +
    + +
    • + +
  • + + pt_r10k_prefix + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    the r10k prefix. defaults to false

    +
    + +
    • + +
  • + + pt_r10k_basedir + + + (String) + + + (defaults to: '/etc/puppetlabs/code/environments') + + + — +
    +

    the base directory for r10k.yaml

    +
    + +
    • + +
  • + + pt_manage_user + + + (Boolean) + + + (defaults to: true) + + +
    • + @@ -1387,11 +1494,6 @@ 
     
 
-81
-82
-83
-84
-85
 86
 87
 88
@@ -1524,10 +1626,32 @@
 215
 216
 217
-218
    +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 +233 +234 +235 +236 +237 +238 +239 +240 - 
    # File 'manifests/params.pp', line 81
+        
    # File 'manifests/params.pp', line 86
 
 class puppet_cd::params (
 
@@ -1540,6 +1664,7 @@ class puppet_cd::params (
   String $pt_agent_pkg              = 'puppet-agent',
   String $pt_server_pkg             = 'puppetserver',
   Array $pt_db_pkg                  = ['puppetdb','puppetdb-termini'],
+  Array $pt_r10k_pkg                = ['ruby','ruby-devel'],
 
   # user settings
   ## puppet user
@@ -1583,7 +1708,7 @@ class puppet_cd::params (
   String $pt_storeconfigs_backend   = 'puppetdb',
   String $pt_parser                 = 'current',
   Boolean $pt_cert_revocation       = true,
-## puppetdb
+  ## puppetdb
   Boolean $pt_use_puppetdb          = false,
   String $pt_logging_max_file_size  = '200MB',
   String $pt_logging_max_history     = '90',
@@ -1611,8 +1736,19 @@ class puppet_cd::params (
   String $pt_repl_port              = '8082',
   String $pt_repl_host              = '127.0.0.1',
 
+# r10k
+  Boolean $pt_use_r10k              = false,
+  Boolean $pt_use_r10k_webhook      = false,
+  String $pt_r10k_remote            = 'git@gitlab.example.net/repo.git',
+  Boolean $pt_r10k_prefix           = false,
+  String $pt_r10k_basedir           = '/etc/puppetlabs/code/environments',
+
 ) {
-  $fqdn                             = $facts['networking']['fqdn']
+# facts
+  $fqdn                   = $facts['networking']['fqdn']
+  $domain                 = $facts['networking']['domain']
+  $os_name                = $facts['os']['name']
+  $os_release             = $facts['os']['release']['major']
 
 # directories
 ## puppet
@@ -1632,6 +1768,8 @@ class puppet_cd::params (
   $pt_puppetdb_ssl                  = "${pt_puppetdb_main}/ssl"
   $pt_puppetdb_log                  = '/var/log/puppetlabs/puppetdb'
   $pt_puppetdb_var_dir              = '/opt/puppetlabs/server/data/puppetdb'
+## r10k
+  $pt_r10k_dir                      = "${pt_main_dir}/r10k"
 
 # files
 ## puppet
@@ -1641,22 +1779,25 @@ class puppet_cd::params (
   $pt_hiera_config                  = "${pt_puppetdir}/hiera.yaml"
 ## puppetdb
   $pt_bootstrap_conf                = "${pt_puppetdb_main}/bootstrap.cfg"
-  $pt_bootstrap_erb                 = 'cd_puppet/puppetdb/bootstrap.cfg.erb'
+  $pt_bootstrap_erb                 = 'puppet_cd/puppetdb/bootstrap.cfg.erb'
   $pt_puppetdb_access_log           = "${pt_puppetdb_log}/puppetdb-access"
   $pt_request_logging_conf          = "${pt_puppetdb_main}/request-logging.xml"
-  $pt_request_logging_erb           = 'cd_puppet/puppetdb/request_logging.xml.erb'
+  $pt_request_logging_erb           = 'puppet_cd/puppetdb/request_logging.xml.erb'
   $pt_logback_conf                  = "${pt_puppetdb_main}/logback.xml"
-  $pt_logback_erb                   = 'cd_puppet/puppetdb/logback.xml.erb'
+  $pt_logback_erb                   = 'puppet_cd/puppetdb/logback.xml.erb'
   $pt_puppetdb_config_ini           = "${pt_puppetdb_conf_d}/config.ini"
-  $pt_puppetdb_config_erb           = 'cd_puppet/puppetdb/config.ini.erb'
+  $pt_puppetdb_config_erb           = 'puppet_cd/puppetdb/config.ini.erb'
   $pt_puppetdb_database_ini         = "${pt_puppetdb_conf_d}/database.ini"
-  $pt_puppetdb_database_erb         = 'cd_puppet/puppetdb/database.ini.erb'
+  $pt_puppetdb_database_erb         = 'puppet_cd/puppetdb/database.ini.erb'
   $pt_puppetdb_jetty_ini            = "${pt_puppetdb_conf_d}/jetty.ini"
-  $pt_puppetdb_jetty_erb            = 'cd_puppet/puppetdb/jetty.ini.erb'
+  $pt_puppetdb_jetty_erb            = 'puppet_cd/puppetdb/jetty.ini.erb'
   $pt_puppetdb_conf_file            = "${pt_puppetdir}/puppetdb.conf"
-  $pt_puppetdb_conf_erb             = 'cd_puppet/puppetdb/puppetdb.conf.erb'
+  $pt_puppetdb_conf_erb             = 'puppet_cd/puppetdb/puppetdb.conf.erb'
   $pt_puppetdb_repl_ini             = "${pt_puppetdb_conf_d}/repl.ini"
-  $pt_puppetdb_repl_erb             = 'cd_puppet/puppetdb/repl.ini.erb'
+  $pt_puppetdb_repl_erb             = 'puppet_cd/puppetdb/repl.ini.erb'
+## r10k
+  $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"
+  $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
 
 # service
   $pt_server_service                = 'puppetserver'
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
new file mode 100644
index 0000000..53e6fbb
--- /dev/null
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -0,0 +1,180 @@
+
+
+  
+    
+
+
+  Puppet Class: puppet_cd::r10k::install
+  
+    — Documentation by YARD 0.9.36
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: puppet_cd::r10k::install
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    puppet_cd::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/r10k/install.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages r10k installation for the puppet_cd module.
+
+
    Overview
    
+
    
+  
    
+    
+
    puppet_cd::r10k::install.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)
    
+
+  
    
+
    
+
+
+
+
    
+  
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
    
+          		
+        
    # File 'manifests/r10k/install.pp', line 6
+
+class puppet_cd::r10k::install (
+
+) inherits puppet_cd::params {
+  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
+    # install required packages
+    package { $pt_r10k_pkg:
+      ensure => $pt_pkg_ensure,
+      before => Package['r10k'],
+    }
+
+    # install r10k via gem
+    package { 'r10k':
+      ensure   => $pt_pkg_ensure,
+      provider => gem,
+    }
+
+    # configure r10k.yaml
+    file { $pt_r10k_file:
+      ensure   => file,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0440',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => unconfined_u,
+      content  => template($pt_r10k_erb),
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
new file mode 100644
index 0000000..632e8d4
--- /dev/null
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
@@ -0,0 +1,130 @@
+
+
+  
+    
+
+
+  Puppet Class: puppet_cd::r10k::webhook
+  
+    — Documentation by YARD 0.9.36
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: puppet_cd::r10k::webhook
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    puppet_cd::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/r10k/webhook.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages r10k webhook settings for the puppet_cd module.
+
+
    Overview
    
+
    
+  
    
+    
+
    puppet_cd::r10k::webhook.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)
    
+
+  
    
+
    
+
+
+
+
    
+  
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+6
+7
+8
+9
+10
    
+          		
+        
    # File 'manifests/r10k/webhook.pp', line 6
+
+class puppet_cd::r10k::webhook (
+
+) inherits puppet_cd::params {
+
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file

From 920ff4573eb5cda43ba927771a5f7e4e5ab9f009 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Tue, 21 Oct 2025 21:11:35 +0200
Subject: [PATCH 04/40] Recommit for updates in build 5

---
 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index 53e6fbb..e0ea45a 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -130,7 +130,8 @@
 32
 33
 34
-35
    
+35
+36
    # File 'manifests/r10k/install.pp', line 6
@@ -138,7 +139,8 @@
 class puppet_cd::r10k::install (
 
 ) inherits puppet_cd::params {
-  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
+#  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
+  if $pt_use_r10k == true {
     # install required packages
     package { $pt_r10k_pkg:
       ensure => $pt_pkg_ensure,

From 340026c5ad38c21f391ea73029f489782d45de3d Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Tue, 21 Oct 2025 21:49:43 +0200
Subject: [PATCH 05/40] Recommit for updates in build 6

---
 doc/_index.html                               |  5 -----
 doc/puppet_class_list.html                    | 11 ++---------
 doc/puppet_classes/puppet_cd_3A_3Aparams.html |  2 --
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/doc/_index.html b/doc/_index.html
index c6d58a4..32a917b 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -123,11 +123,6 @@
       
             
     
-            
  • 
-      puppet_cd::r10k::install
-      
-            
    • 
-    
             
  • 
       puppet_cd::r10k::webhook
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index a1f97c5..42e1315 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -113,21 +113,14 @@
     
    • 
     
 
-    
  • 
-      
    
-        puppet_cd::r10k::install
-      
    
-    
    • 
-    
-
-    
  • 
+    
  • 
       
    
         puppet_cd::r10k::webhook
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::server::service
       
    
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index 19a3b91..29163d4 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -77,8 +77,6 @@
       
       puppet_cd::main::install
    
       
-      puppet_cd::r10k::install
    
-      
       puppet_cd::r10k::webhook
    
       
       puppet_cd::puppetdb::dirs
    

From d07655c7a566c91f20248bbeb0b3c1ed4cef8e5a Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Tue, 21 Oct 2025 22:01:38 +0200
Subject: [PATCH 06/40] Recommit for updates in build 7

---
 doc/_index.html                               |  5 +++++
 doc/puppet_class_list.html                    | 11 ++++++++--
 doc/puppet_classes/puppet_cd_3A_3Aparams.html |  6 +++--
 .../puppet_cd_3A_3Ar10k_3A_3Ainstall.html     | 22 ++++++++++++++++---
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/doc/_index.html b/doc/_index.html
index 32a917b..c6d58a4 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -123,6 +123,11 @@
       
             
    • 
     
+            
  • 
+      puppet_cd::r10k::install
+      
+            
    • 
+    
             
  • 
       puppet_cd::r10k::webhook
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index 42e1315..a1f97c5 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -113,14 +113,21 @@
     
    • 
     
 
-    
  • 
+    
  • 
+      
    
+        puppet_cd::r10k::install
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         puppet_cd::r10k::webhook
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::server::service
       
    
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index 29163d4..4fd74ab 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -77,6 +77,8 @@
       
       puppet_cd::main::install
    
       
+      puppet_cd::r10k::install
    
+      
       puppet_cd::r10k::webhook
    
       
       puppet_cd::puppetdb::dirs
    
@@ -252,7 +254,7 @@
         (Array)
       
       
-        (defaults to: ['ruby','ruby-devel'])
+        (defaults to: ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'])
       
       
         —
@@ -1662,7 +1664,7 @@ class puppet_cd::params (
   String $pt_agent_pkg              = 'puppet-agent',
   String $pt_server_pkg             = 'puppetserver',
   Array $pt_db_pkg                  = ['puppetdb','puppetdb-termini'],
-  Array $pt_r10k_pkg                = ['ruby','ruby-devel'],
+  Array $pt_r10k_pkg                = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'],
 
   # user settings
   ## puppet user
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index e0ea45a..1062bd8 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -131,7 +131,15 @@
 33
 34
 35
-36
    • +36 +37 +38 +39 +40 +41 +42 +43 +44 
    # File 'manifests/r10k/install.pp', line 6
@@ -141,10 +149,18 @@ class puppet_cd::r10k::install (
 ) inherits puppet_cd::params {
 #  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
   if $pt_use_r10k == true {
+    # enable CRB
+    exec { 'enable_crb':
+      command => 'dnf config-manager --set-enabled crb',
+      unless  => 'dnf repolist --disabled | grep -qE "crb|CodeReady"',
+      path    => ['/usr/bin', '/bin'],
+    }
+
     # install required packages
     package { $pt_r10k_pkg:
-      ensure => $pt_pkg_ensure,
-      before => Package['r10k'],
+      ensure  => $pt_pkg_ensure,
+      before  => Package['r10k'],
+      require => Exec['enable_crb'],
     }
 
     # install r10k via gem

From b8538c500ddb8741910938e0bd48d4c4bb85928c Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Tue, 21 Oct 2025 22:13:37 +0200
Subject: [PATCH 07/40] Recommit for updates in build 8

---
 .../puppet_cd_3A_3Ar10k_3A_3Ainstall.html     | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index 1062bd8..4ee4fd1 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -139,7 +139,21 @@
 41
 42
 43
-44
    +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 
    # File 'manifests/r10k/install.pp', line 6
@@ -169,6 +183,19 @@ class puppet_cd::r10k::install (
       provider => gem,
     }
 
+    # create r10k dir
+    file { 'r10k_dir':
+      ensure   => directory,
+      path     => $pt_r10k_dir,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => unconfined_u,
+    }
+
     # configure r10k.yaml
     file { $pt_r10k_file:
       ensure   => file,
@@ -179,6 +206,7 @@ class puppet_cd::r10k::install (
       selrole  => object_r,
       seltype  => puppet_etc_t,
       seluser  => unconfined_u,
+      require  => File['r10k_dir'],
       content  => template($pt_r10k_erb),
     }
   }

From 7ff0fca4a0774b78c830431938c0230ce4bed56a Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Tue, 21 Oct 2025 22:22:32 +0200
Subject: [PATCH 08/40] Recommit for updates in build 9

---
 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index 4ee4fd1..ae245f6 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -152,8 +152,7 @@
 54
 55
 56
-57
-58
    +57 
    # File 'manifests/r10k/install.pp', line 6
@@ -161,8 +160,7 @@
 class puppet_cd::r10k::install (
 
 ) inherits puppet_cd::params {
-#  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
-  if $pt_use_r10k == true {
+  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
     # enable CRB
     exec { 'enable_crb':
       command => 'dnf config-manager --set-enabled crb',

From d02e9b359ffcf578fb29fe9917445de41afc4457 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Tue, 21 Oct 2025 22:27:41 +0200
Subject: [PATCH 09/40] Recommit for updates in build 10

---
 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index ae245f6..a44434d 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -199,7 +199,7 @@ class puppet_cd::r10k::install (
       ensure   => file,
       owner    => 'root',
       group    => 'root',
-      mode     => '0440',
+      mode     => '0644',
       selrange => s0,
       selrole  => object_r,
       seltype  => puppet_etc_t,

From 883313366b725ed5a5816f885fd2d51d4ce47313 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 23 Oct 2025 16:48:22 +0200
Subject: [PATCH 10/40] Recommit for updates in build 11

---
 doc/puppet_classes/puppet_cd_3A_3Aparams.html |  43 ++++++-
 .../puppet_cd_3A_3Ar10k_3A_3Awebhook.html     | 110 +++++++++++++++++-
 2 files changed, 148 insertions(+), 5 deletions(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index 4fd74ab..88afd11 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -1470,6 +1470,24 @@
       
     
   
+    
  • 
+      
+        pt_r10k_webhook_pkg
+      
+      
+        (String)
+      
+      
+        (defaults to: 'python3-pip')
+      
+      
+        —
+        
    
+
    the packages for the r10k webhook
    
+
    
+      
+    
    • 
+  
     
  • 
       
         pt_manage_user
@@ -1481,6 +1499,11 @@
         (defaults to: true)
       
       
+        —
+        
    
+
    whether to manage the puppet user
    
+
    
+      
     
    • 
   
 
@@ -1494,8 +1517,6 @@
         
     
 
-86
-87
 88
 89
 90
@@ -1648,10 +1669,18 @@
 237
 238
 239
-240
    
+240
+241
+242
+243
+244
+245
+246
+247
+248
    - 
    # File 'manifests/params.pp', line 86
+        
    # File 'manifests/params.pp', line 88
 
 class puppet_cd::params (
 
@@ -1665,6 +1694,7 @@ class puppet_cd::params (
   String $pt_server_pkg             = 'puppetserver',
   Array $pt_db_pkg                  = ['puppetdb','puppetdb-termini'],
   Array $pt_r10k_pkg                = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'],
+  String $pt_r10k_webhook_pkg       = 'python3-pip',
 
   # user settings
   ## puppet user
@@ -1770,6 +1800,7 @@ class puppet_cd::params (
   $pt_puppetdb_var_dir              = '/opt/puppetlabs/server/data/puppetdb'
 ## r10k
   $pt_r10k_dir                      = "${pt_main_dir}/r10k"
+  $pt_r10k_webhook_dir              = '/opt/r10k-webhook'
 
 # files
 ## puppet
@@ -1798,6 +1829,10 @@ class puppet_cd::params (
 ## r10k
   $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"
   $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
+  $pt_r10k_webhook_file             = "${pt_r10k_webhook_dir}/webhook_server.py"
+  $pt_r10k_webhook_erb              = 'puppet_cd/r10k/webhook.py.erb'
+  $pt_r10k_req_file                 = "${pt_r10k_webhook_dir}/requirements.txt"
+  $pt_r10k_req_erb                  = 'puppet_cd/r10k/requirements.txt.erb'
 
 # service
   $pt_server_service                = 'puppetserver'
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
index 632e8d4..00efc32 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
@@ -105,7 +105,61 @@
 7
 8
 9
-10
    
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+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
    # File 'manifests/r10k/webhook.pp', line 6
@@ -113,7 +167,61 @@
 class puppet_cd::r10k::webhook (
 
 ) inherits puppet_cd::params {
+  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k_webhook == true) {
+    # install packages
+    package { $pt_r10k_webhook_pkg:
+      ensure => $pt_pkg_ensure,
+    }
 
+    # create the webhook dir
+    file { '/opt/r10k-webhook':
+      ensure   => directory,
+      path     => $pt_r10k_webhook_dir,
+      owner    => 'puppet',
+      group    => 'puppet',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+    }
+
+    # create the requirements file
+    file { $pt_r10k_req_file:
+      ensure   => file,
+      owner    => 'puppet',
+      group    => 'puppet',
+      mode     => '0644',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+      content  => template($pt_r10k_req_erb),
+      require  => File['/opt/r10k-webhook'],
+    }
+
+    # create the binary file
+    file { $pt_r10k_webhook_file:
+      ensure   => file,
+      owner    => 'puppet',
+      group    => 'puppet',
+      mode     => '0644',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+      content  => template($pt_r10k_webhook_erb),
+      require  => File['/opt/r10k-webhook'],
+    }
+
+    # install pip dependencies
+    exec { 'pip_install_r10k_webhook':
+      command => 'pip3 install --user -r /opt/r10k-webhook/requirements.txt',
+      user    => 'puppet',
+      require => [Package[$pt_r10k_webhook_pkg],File[$pt_r10k_req_file]],
+      unless  => 'pip3 show fastapi',  # Idempotent check
+    }
+  }
 }
    From 60051b12c22d1a4ecda380b8cef7fd8b60a7c797 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 23 Oct 2025 17:23:46 +0200 Subject: [PATCH 11/40] Recommit for updates in build 12 --- ...puppet_cd_3A_3Afirewall_3A_3Aiptables.html | 16 ++++- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 8 ++- .../puppet_cd_3A_3Ar10k_3A_3Awebhook.html | 64 ++++++++++++++++++- 3 files changed, 85 insertions(+), 3 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html index 86bc85d..e269b4f 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html @@ -139,7 +139,14 @@ 41 42 43 -44 +44 +45 +46 +47 +48 +49 +50 +51 
    # File 'manifests/firewall/iptables.pp', line 6
@@ -158,6 +165,13 @@ class puppet_cd::firewall::iptables (
       dport => '8443',
       jump  => 'accept',
     }
+    if $pt_use_r10k_webhook == true {
+      firewall { '38080 open port 8080':
+        proto => 'tcp',
+        dport => '8080',
+        jump  => 'accept',
+      }
+    }
   }
 
   if $fqdn == $pt_db_fqdn {
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index 88afd11..5c6da7a 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -1677,7 +1677,10 @@
 245
 246
 247
-248
    +248 +249 +250 +251 
    # File 'manifests/params.pp', line 88
@@ -1833,11 +1836,14 @@ class puppet_cd::params (
   $pt_r10k_webhook_erb              = 'puppet_cd/r10k/webhook.py.erb'
   $pt_r10k_req_file                 = "${pt_r10k_webhook_dir}/requirements.txt"
   $pt_r10k_req_erb                  = 'puppet_cd/r10k/requirements.txt.erb'
+  $pt_r10k_wh_service_file          = '/etc/systemd/system/r10k-webhook.service'
+  $pt_r10k_wh_service_erb           = 'puppet_cd/r10k/r10k_webhook_service.erb'
 
 # service
   $pt_server_service                = 'puppetserver'
   $pt_agent_service                 = 'puppet'
   $pt_db_service                    = 'puppetdb'
+  $pt_r10k_wb_service               = 'r10k-webhook'
 
 #
   # includes must be last
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
index 00efc32..74d9a53 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
@@ -159,7 +159,38 @@
 61
 62
 63
-64
    +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 
    # File 'manifests/r10k/webhook.pp', line 6
@@ -221,6 +252,37 @@ class puppet_cd::r10k::webhook (
       require => [Package[$pt_r10k_webhook_pkg],File[$pt_r10k_req_file]],
       unless  => 'pip3 show fastapi',  # Idempotent check
     }
+
+    # establish exec systemd reload
+    exec { 'systemctl_daemon_reload':
+      command     => 'systemctl daemon-reload',
+      path        => ['/bin', '/usr/bin'],
+      require     => Exec['pip_install_r10k_webhook'],
+      refreshonly => true,
+    }
+
+    # install systemd service file
+    file { $pt_r10k_wh_service_file:
+      ensure   => file,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0644',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => systemd_unit_file_t,
+      seluser  => system_u,
+      content  => template($pt_r10k_wh_service_erb),
+      require  => Exec['systemctl_daemon_reload'],
+      notify   => Exec['systemctl_daemon_reload'],
+    }
+
+    # manage service
+    service { 'r10k-webhook':
+      ensure    => 'running',
+      enable    => true,
+      require   => File[$pt_r10k_wh_service_file],
+      subscribe => File[$pt_r10k_webhook_file],
+    }
   }
 }
    From 415abf2322009064411c47ae2a93f58442f9e158 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 23 Oct 2025 17:28:41 +0200 Subject: [PATCH 12/40] Recommit for updates in build 13 --- doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html index 74d9a53..5b1d483 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html @@ -189,8 +189,7 @@ 91 92 93 -94 -95 +94 
    # File 'manifests/r10k/webhook.pp', line 6
@@ -272,7 +271,6 @@ class puppet_cd::r10k::webhook (
       seltype  => systemd_unit_file_t,
       seluser  => system_u,
       content  => template($pt_r10k_wh_service_erb),
-      require  => Exec['systemctl_daemon_reload'],
       notify   => Exec['systemctl_daemon_reload'],
     }
 

From dc7588279a8481e1ee556b5a9027ea94ffae8192 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 23 Oct 2025 18:03:13 +0200
Subject: [PATCH 13/40] Recommit for updates in build 15

---
 .../puppet_cd_3A_3Ar10k_3A_3Awebhook.html     | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
index 5b1d483..ac3c328 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
@@ -189,7 +189,16 @@
 91
 92
 93
-94
    +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 
    # File 'manifests/r10k/webhook.pp', line 6
@@ -216,6 +225,15 @@ class puppet_cd::r10k::webhook (
       seluser  => system_u,
     }
 
+    # create the log file
+    file { '/var/log/r10k-webhook.log':
+      ensure  => file,
+      owner   => 'puppet',
+      group   => 'puppet',
+      mode    => '0644',
+      require => File['/opt/r10k-webhook'],
+    }
+
     # create the requirements file
     file { $pt_r10k_req_file:
       ensure   => file,
@@ -227,7 +245,7 @@ class puppet_cd::r10k::webhook (
       seltype  => puppet_etc_t,
       seluser  => system_u,
       content  => template($pt_r10k_req_erb),
-      require  => File['/opt/r10k-webhook'],
+      require  => File['/var/log/r10k-webhook.log'],
     }
 
     # create the binary file

From 7e21247f88a5f99cff77614cf7797cc20f43ad09 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 23 Oct 2025 18:21:17 +0200
Subject: [PATCH 14/40] Recommit for updates in build 16

---
 doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
index 00f8d54..8c9b42d 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
@@ -128,10 +128,10 @@ class puppet_cd::main::config (
     include puppet_cd::puppetdb::service
   }
 
-  if $pt_use_r10k == true {
-    include puppet_cd::r10k::install
-    include puppet_cd::r10k::webhook
-  }
+#  if $pt_use_r10k == true {
+#    include puppet_cd::r10k::install
+#    include puppet_cd::r10k::webhook
+#  }
 }
    From 6e607d9f430bb2abd95c72a77513ae0ddd542ddf Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 23 Oct 2025 18:58:21 +0200 Subject: [PATCH 15/40] Recommit for updates in build 17 --- ...puppet_cd_3A_3Afirewall_3A_3Aiptables.html | 4 +- .../puppet_cd_3A_3Amain_3A_3Aconfig.html | 8 +- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 6 +- .../puppet_cd_3A_3Ar10k_3A_3Awebhook.html | 80 ++++--------------- 4 files changed, 24 insertions(+), 74 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html index e269b4f..93485cf 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html @@ -166,9 +166,9 @@ class puppet_cd::firewall::iptables ( jump => 'accept', } if $pt_use_r10k_webhook == true { - firewall { '38080 open port 8080': + firewall { '38088 open port 8088': proto => 'tcp', - dport => '8080', + dport => '8088', jump => 'accept', } } diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html index 8c9b42d..00f8d54 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html @@ -128,10 +128,10 @@ class puppet_cd::main::config ( include puppet_cd::puppetdb::service } -# if $pt_use_r10k == true { -# include puppet_cd::r10k::install -# include puppet_cd::r10k::webhook -# } + if $pt_use_r10k == true { + include puppet_cd::r10k::install + include puppet_cd::r10k::webhook + } } diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 5c6da7a..0b36cf0 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -1803,7 +1803,7 @@ class puppet_cd::params ( $pt_puppetdb_var_dir = '/opt/puppetlabs/server/data/puppetdb' ## r10k $pt_r10k_dir = "${pt_main_dir}/r10k" - $pt_r10k_webhook_dir = '/opt/r10k-webhook' + $pt_r10k_webhook_dir = '/etc/r10k-webhook' # files ## puppet @@ -1836,8 +1836,8 @@ class puppet_cd::params ( $pt_r10k_webhook_erb = 'puppet_cd/r10k/webhook.py.erb' $pt_r10k_req_file = "${pt_r10k_webhook_dir}/requirements.txt" $pt_r10k_req_erb = 'puppet_cd/r10k/requirements.txt.erb' - $pt_r10k_wh_service_file = '/etc/systemd/system/r10k-webhook.service' - $pt_r10k_wh_service_erb = 'puppet_cd/r10k/r10k_webhook_service.erb' + $pt_r10k_wh_config_file = "${pt_r10k_webhook_dir}/config.json" + $pt_r10k_wh_config_erb = 'puppet_cd/r10k/r10k_webhook_config.erb' # service $pt_server_service = 'puppetserver' diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html index ac3c328..d51ba97 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html @@ -173,32 +173,7 @@ 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 +78 
    # File 'manifests/r10k/webhook.pp', line 6
@@ -213,27 +188,17 @@ class puppet_cd::r10k::webhook (
     }
 
     # create the webhook dir
-    file { '/opt/r10k-webhook':
+    file { $pt_r10k_webhook_dir:
       ensure   => directory,
-      path     => $pt_r10k_webhook_dir,
-      owner    => 'puppet',
-      group    => 'puppet',
+      owner    => 'root',
+      group    => 'root',
       mode     => '0755',
       selrange => s0,
       selrole  => object_r,
-      seltype  => puppet_etc_t,
+      seltype  => etc_t,
       seluser  => system_u,
     }
 
-    # create the log file
-    file { '/var/log/r10k-webhook.log':
-      ensure  => file,
-      owner   => 'puppet',
-      group   => 'puppet',
-      mode    => '0644',
-      require => File['/opt/r10k-webhook'],
-    }
-
     # create the requirements file
     file { $pt_r10k_req_file:
       ensure   => file,
@@ -242,26 +207,26 @@ class puppet_cd::r10k::webhook (
       mode     => '0644',
       selrange => s0,
       selrole  => object_r,
-      seltype  => puppet_etc_t,
+      seltype  => etc_t,
       seluser  => system_u,
       content  => template($pt_r10k_req_erb),
-      require  => File['/var/log/r10k-webhook.log'],
     }
 
-    # create the binary file
-    file { $pt_r10k_webhook_file:
+    # create the webhook config file
+    file { $pt_r10k_wh_config_file:
       ensure   => file,
-      owner    => 'puppet',
-      group    => 'puppet',
+      owner    => 'root',
+      group    => 'root',
       mode     => '0644',
       selrange => s0,
       selrole  => object_r,
-      seltype  => puppet_etc_t,
+      seltype  => etc_t,
       seluser  => system_u,
-      content  => template($pt_r10k_webhook_erb),
-      require  => File['/opt/r10k-webhook'],
+      content  => template($pt_r10k_wh_config_erb),
+      require  => File[$pt_r10k_webhook_dir],
     }
 
+
     # install pip dependencies
     exec { 'pip_install_r10k_webhook':
       command => 'pip3 install --user -r /opt/r10k-webhook/requirements.txt',
@@ -278,26 +243,11 @@ class puppet_cd::r10k::webhook (
       refreshonly => true,
     }
 
-    # install systemd service file
-    file { $pt_r10k_wh_service_file:
-      ensure   => file,
-      owner    => 'root',
-      group    => 'root',
-      mode     => '0644',
-      selrange => s0,
-      selrole  => object_r,
-      seltype  => systemd_unit_file_t,
-      seluser  => system_u,
-      content  => template($pt_r10k_wh_service_erb),
-      notify   => Exec['systemctl_daemon_reload'],
-    }
-
     # manage service
     service { 'r10k-webhook':
       ensure    => 'running',
       enable    => true,
-      require   => File[$pt_r10k_wh_service_file],
-      subscribe => File[$pt_r10k_webhook_file],
+      subscribe => File[$pt_r10k_wh_config_file],
     }
   }
 }
    From ea5dc1ad1cab3c5998ce66ed44ade2065886e93f Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 23 Oct 2025 20:22:43 +0200 Subject: [PATCH 16/40] Recommit for updates in build 21 --- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 24 +--- .../puppet_cd_3A_3Ar10k_3A_3Awebhook.html | 122 ++---------------- 2 files changed, 15 insertions(+), 131 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 0b36cf0..0df5e7c 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -1670,17 +1670,7 @@ 238 239 240 -241 -242 -243 -244 -245 -246 -247 -248 -249 -250 -251 +241 
    # File 'manifests/params.pp', line 88
@@ -1801,9 +1791,6 @@ class puppet_cd::params (
   $pt_puppetdb_ssl                  = "${pt_puppetdb_main}/ssl"
   $pt_puppetdb_log                  = '/var/log/puppetlabs/puppetdb'
   $pt_puppetdb_var_dir              = '/opt/puppetlabs/server/data/puppetdb'
-## r10k
-  $pt_r10k_dir                      = "${pt_main_dir}/r10k"
-  $pt_r10k_webhook_dir              = '/etc/r10k-webhook'
 
 # files
 ## puppet
@@ -1830,14 +1817,7 @@ class puppet_cd::params (
   $pt_puppetdb_repl_ini             = "${pt_puppetdb_conf_d}/repl.ini"
   $pt_puppetdb_repl_erb             = 'puppet_cd/puppetdb/repl.ini.erb'
 ## r10k
-  $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"
-  $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
-  $pt_r10k_webhook_file             = "${pt_r10k_webhook_dir}/webhook_server.py"
-  $pt_r10k_webhook_erb              = 'puppet_cd/r10k/webhook.py.erb'
-  $pt_r10k_req_file                 = "${pt_r10k_webhook_dir}/requirements.txt"
-  $pt_r10k_req_erb                  = 'puppet_cd/r10k/requirements.txt.erb'
-  $pt_r10k_wh_config_file           =  "${pt_r10k_webhook_dir}/config.json"
-  $pt_r10k_wh_config_erb            = 'puppet_cd/r10k/r10k_webhook_config.erb'
+  $pt_r10k_hook_file                = '/usr/local/bin/webhook'
 
 # service
   $pt_server_service                = 'puppetserver'
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
index d51ba97..a149208 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
@@ -125,55 +125,7 @@
 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
    +30 
    # File 'manifests/r10k/webhook.pp', line 6
@@ -182,73 +134,25 @@ class puppet_cd::r10k::webhook (
 
 ) inherits puppet_cd::params {
   if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k_webhook == true) {
-    # install packages
-    package { $pt_r10k_webhook_pkg:
-      ensure => $pt_pkg_ensure,
-    }
-
-    # create the webhook dir
-    file { $pt_r10k_webhook_dir:
-      ensure   => directory,
+    # create the webhook binary
+    file { $pt_r10k_hook_file:
+      ensure   => file,
       owner    => 'root',
       group    => 'root',
       mode     => '0755',
       selrange => s0,
       selrole  => object_r,
-      seltype  => etc_t,
-      seluser  => system_u,
+      seltype  => bin_t,
+      seluser  => unconfined_u,
+      source   => 'puppet:///module/puppet_cd/webhook',
     }
 
-    # create the requirements file
-    file { $pt_r10k_req_file:
-      ensure   => file,
-      owner    => 'puppet',
-      group    => 'puppet',
-      mode     => '0644',
-      selrange => s0,
-      selrole  => object_r,
-      seltype  => etc_t,
-      seluser  => system_u,
-      content  => template($pt_r10k_req_erb),
-    }
-
-    # create the webhook config file
-    file { $pt_r10k_wh_config_file:
-      ensure   => file,
-      owner    => 'root',
-      group    => 'root',
-      mode     => '0644',
-      selrange => s0,
-      selrole  => object_r,
-      seltype  => etc_t,
-      seluser  => system_u,
-      content  => template($pt_r10k_wh_config_erb),
-      require  => File[$pt_r10k_webhook_dir],
-    }
-
-
-    # install pip dependencies
-    exec { 'pip_install_r10k_webhook':
-      command => 'pip3 install --user -r /opt/r10k-webhook/requirements.txt',
-      user    => 'puppet',
-      require => [Package[$pt_r10k_webhook_pkg],File[$pt_r10k_req_file]],
-      unless  => 'pip3 show fastapi',  # Idempotent check
-    }
-
-    # establish exec systemd reload
-    exec { 'systemctl_daemon_reload':
-      command     => 'systemctl daemon-reload',
-      path        => ['/bin', '/usr/bin'],
-      require     => Exec['pip_install_r10k_webhook'],
-      refreshonly => true,
-    }
-
-    # manage service
-    service { 'r10k-webhook':
-      ensure    => 'running',
-      enable    => true,
-      subscribe => File[$pt_r10k_wh_config_file],
-    }
+#    # manage service
+#    service { 'r10k-webhook':
+#      ensure    => 'running',
+#      enable    => true,
+#      subscribe => File[$pt_r10k_wh_config_file],
+#    }
   }
 }
    From b849ac0994a80071316ea346b43dafb12e479ea7 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 23 Oct 2025 20:31:21 +0200 Subject: [PATCH 17/40] Recommit for updates in build 22 --- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 0df5e7c..2eb2bb9 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -1670,7 +1670,10 @@ 238 239 240 -241 +241 +242 +243 +244 
    # File 'manifests/params.pp', line 88
@@ -1791,6 +1794,8 @@ class puppet_cd::params (
   $pt_puppetdb_ssl                  = "${pt_puppetdb_main}/ssl"
   $pt_puppetdb_log                  = '/var/log/puppetlabs/puppetdb'
   $pt_puppetdb_var_dir              = '/opt/puppetlabs/server/data/puppetdb'
+## r10k
+  $pt_r10k_dir                      = "${pt_main_dir}/r10k"
 
 # files
 ## puppet
@@ -1818,6 +1823,7 @@ class puppet_cd::params (
   $pt_puppetdb_repl_erb             = 'puppet_cd/puppetdb/repl.ini.erb'
 ## r10k
   $pt_r10k_hook_file                = '/usr/local/bin/webhook'
+  $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
 
 # service
   $pt_server_service                = 'puppetserver'

From cbcc094564dba29a8dd56bfc34962d4fc5a5b3ef Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 23 Oct 2025 20:36:58 +0200
Subject: [PATCH 18/40] Recommit for updates in build 23

---
 doc/puppet_classes/puppet_cd_3A_3Aparams.html | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index 2eb2bb9..c2e0427 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -1673,7 +1673,14 @@
 241
 242
 243
-244
    +244 +245 +246 +247 +248 +249 +250 +251 
    # File 'manifests/params.pp', line 88
@@ -1822,8 +1829,15 @@ class puppet_cd::params (
   $pt_puppetdb_repl_ini             = "${pt_puppetdb_conf_d}/repl.ini"
   $pt_puppetdb_repl_erb             = 'puppet_cd/puppetdb/repl.ini.erb'
 ## r10k
-  $pt_r10k_hook_file                = '/usr/local/bin/webhook'
+  $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"
   $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
+  $pt_r10k_webhook_file             = "${pt_r10k_webhook_dir}/webhook_server.py"
+  $pt_r10k_webhook_erb              = 'puppet_cd/r10k/webhook.py.erb'
+  $pt_r10k_req_file                 = "${pt_r10k_webhook_dir}/requirements.txt"
+  $pt_r10k_req_erb                  = 'puppet_cd/r10k/requirements.txt.erb'
+  $pt_r10k_wh_config_file           =  "${pt_r10k_webhook_dir}/config.json"
+  $pt_r10k_wh_config_erb            = 'puppet_cd/r10k/r10k_webhook_config.erb'
+  $pt_r10k_hook_file                = '/usr/local/bin/webhook'
 
 # service
   $pt_server_service                = 'puppetserver'

From 308863e9d0a5191f792e80b18bef722efed77ed5 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 23 Oct 2025 20:41:12 +0200
Subject: [PATCH 19/40] Recommit for updates in build 24

---
 doc/puppet_classes/puppet_cd_3A_3Aparams.html | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index c2e0427..49a4de6 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -1674,13 +1674,7 @@
 242
 243
 244
-245
-246
-247
-248
-249
-250
-251
    +245 
    # File 'manifests/params.pp', line 88
@@ -1831,12 +1825,6 @@ class puppet_cd::params (
 ## r10k
   $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"
   $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
-  $pt_r10k_webhook_file             = "${pt_r10k_webhook_dir}/webhook_server.py"
-  $pt_r10k_webhook_erb              = 'puppet_cd/r10k/webhook.py.erb'
-  $pt_r10k_req_file                 = "${pt_r10k_webhook_dir}/requirements.txt"
-  $pt_r10k_req_erb                  = 'puppet_cd/r10k/requirements.txt.erb'
-  $pt_r10k_wh_config_file           =  "${pt_r10k_webhook_dir}/config.json"
-  $pt_r10k_wh_config_erb            = 'puppet_cd/r10k/r10k_webhook_config.erb'
   $pt_r10k_hook_file                = '/usr/local/bin/webhook'
 
 # service

From 066d396a585af2b12f955055b240fe3163e692e3 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 23 Oct 2025 20:48:37 +0200
Subject: [PATCH 20/40] Recommit for updates in build 25

---
 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
index a149208..3cff152 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
@@ -144,7 +144,7 @@ class puppet_cd::r10k::webhook (
       selrole  => object_r,
       seltype  => bin_t,
       seluser  => unconfined_u,
-      source   => 'puppet:///module/puppet_cd/webhook',
+      source   => 'puppet:///modules/puppet_cd/webhook',
     }
 
 #    # manage service

From 2360ac75a9efe98e44dd99d4b6c9772ec8caf87e Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 23 Oct 2025 21:21:11 +0200
Subject: [PATCH 21/40] Recommit for updates in build 27

---
 doc/puppet_classes/puppet_cd_3A_3Aparams.html | 12 ++-
 .../puppet_cd_3A_3Ar10k_3A_3Awebhook.html     | 86 +++++++++++++++++--
 2 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index 49a4de6..8d87298 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -1674,7 +1674,11 @@
 242
 243
 244
-245
    +245 +246 +247 +248 +249 
    # File 'manifests/params.pp', line 88
@@ -1797,6 +1801,7 @@ class puppet_cd::params (
   $pt_puppetdb_var_dir              = '/opt/puppetlabs/server/data/puppetdb'
 ## r10k
   $pt_r10k_dir                      = "${pt_main_dir}/r10k"
+  $pt_r10k_webhook_dir              = '/etc/r10k-webhook'
 
 # files
 ## puppet
@@ -1826,12 +1831,15 @@ class puppet_cd::params (
   $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"
   $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
   $pt_r10k_hook_file                = '/usr/local/bin/webhook'
+  $pt_r10k_hook_config_file         = "${pt_r10k_webhook_dir}/hooks.json"
+  $pt_r10k_hook_config_erb          = 'puppet_cd/r10k/hook_config.erb'
+  $pt_r10k_hook_service_file        = '/etc/systemd/system/webhook.service'
+  $pt_r10k_hook_service_erb         = 'puppet_cd/r10k/r10k_webhook_service.erb'
 
 # service
   $pt_server_service                = 'puppetserver'
   $pt_agent_service                 = 'puppet'
   $pt_db_service                    = 'puppetdb'
-  $pt_r10k_wb_service               = 'r10k-webhook'
 
 #
   # includes must be last
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
index 3cff152..e1b680c 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
@@ -125,7 +125,43 @@
 27
 28
 29
-30
    +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 
    # File 'manifests/r10k/webhook.pp', line 6
@@ -147,12 +183,48 @@ class puppet_cd::r10k::webhook (
       source   => 'puppet:///modules/puppet_cd/webhook',
     }
 
-#    # manage service
-#    service { 'r10k-webhook':
-#      ensure    => 'running',
-#      enable    => true,
-#      subscribe => File[$pt_r10k_wh_config_file],
-#    }
+    # create the webhook config dir
+    file { $pt_r10k_webhook_dir:
+      ensure   => directory,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => etc_t,
+      seluser  => system_u,
+    }
+
+    # create webhook config
+    file { $pt_r10k_hook_config_file:
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0644',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => etc_t,
+      seluser  => system_u,
+      content  => template($pt_r10k_hook_config_erb),
+    }
+
+    # create service config
+    file { $pt_r10k_hook_config_file:
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0644',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => systemd_unit_file_t,
+      seluser  => system_u,
+      content  => template($pt_r10k_hook_service_erb),
+    }
+
+    # manage service
+    service { 'r10k-webhook':
+      ensure    => 'running',
+      enable    => true,
+      subscribe => File[$pt_r10k_hook_config_file],
+    }
   }
 }
    From 12a558bc3afc6e88ffdda98522cdb7456bc7c597 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 23 Oct 2025 21:27:05 +0200 Subject: [PATCH 22/40] Recommit for updates in build 28 --- doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html index e1b680c..d2b7101 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html @@ -208,7 +208,7 @@ class puppet_cd::r10k::webhook ( } # create service config - file { $pt_r10k_hook_config_file: + file { $pt_r10k_hook_service_file: owner => 'root', group => 'root', mode => '0644', @@ -223,7 +223,7 @@ class puppet_cd::r10k::webhook ( service { 'r10k-webhook': ensure => 'running', enable => true, - subscribe => File[$pt_r10k_hook_config_file], + subscribe => File[$pt_r10k_hook_service_file], } } } From 4edc0ce073a97e62c995b25faa285ef2681f1ea4 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 23 Oct 2025 21:32:00 +0200 Subject: [PATCH 23/40] Recommit for updates in build 29 --- .../puppet_cd_3A_3Ar10k_3A_3Awebhook.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html index d2b7101..193d574 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html @@ -161,7 +161,9 @@ 63 64 65 -66 +66 +67 +68 
    # File 'manifests/r10k/webhook.pp', line 6
@@ -221,9 +223,11 @@ class puppet_cd::r10k::webhook (
 
     # manage service
     service { 'r10k-webhook':
-      ensure    => 'running',
-      enable    => true,
-      subscribe => File[$pt_r10k_hook_service_file],
+      ensure     => 'running',
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+      subscribe  => File[$pt_r10k_hook_service_file],
     }
   }
 }
    From 5ae6cd2408f52b1d482f292dc9b099d0a895b4df Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 23 Oct 2025 22:16:37 +0200 Subject: [PATCH 24/40] Recommit for updates in build 34 --- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 26 ++++++++++++++++--- .../puppet_cd_3A_3Ar10k_3A_3Awebhook.html | 8 +++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 8d87298..51cc71c 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -1502,6 +1502,24 @@ —

    whether to manage the puppet user

    +
    + + + +
  • + + pt_webhook_secret + + + (String) + + + (defaults to: '') + + + — +
    +

    the secret for the webhook

    • @@ -1517,7 +1535,6 @@ 
     
 
-88
 89
 90
 91
@@ -1678,10 +1695,12 @@
 246
 247
 248
-249
    +249 +250 +251 - 
    # File 'manifests/params.pp', line 88
+        
    # File 'manifests/params.pp', line 89
 
 class puppet_cd::params (
 
@@ -1773,6 +1792,7 @@ class puppet_cd::params (
   String $pt_r10k_remote            = 'git@gitlab.example.net/repo.git',
   Boolean $pt_r10k_prefix           = false,
   String $pt_r10k_basedir           = '/etc/puppetlabs/code/environments',
+  String $pt_webhook_secret         = '',
 
 ) {
 # facts
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
index 193d574..eef1759 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
@@ -163,7 +163,8 @@
 65
 66
 67
-68
    
+68
+69
    # File 'manifests/r10k/webhook.pp', line 6
@@ -207,6 +208,7 @@ class puppet_cd::r10k::webhook (
       seltype  => etc_t,
       seluser  => system_u,
       content  => template($pt_r10k_hook_config_erb),
+      notify   => Service['webhook'],
     }
 
     # create service config
@@ -219,15 +221,15 @@ class puppet_cd::r10k::webhook (
       seltype  => systemd_unit_file_t,
       seluser  => system_u,
       content  => template($pt_r10k_hook_service_erb),
+      notify   => Service['webhook'],
     }
 
     # manage service
-    service { 'r10k-webhook':
+    service { 'webhook':
       ensure     => 'running',
       hasstatus  => true,
       hasrestart => true,
       enable     => true,
-      subscribe  => File[$pt_r10k_hook_service_file],
     }
   }
 }
    From dd7272e0a9a7e9530dd9c3bc88f834708b78ad5a Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sat, 25 Oct 2025 18:36:18 +0200 Subject: [PATCH 25/40] Recommit for updates in build 51 --- doc/_index.html | 5 --- doc/puppet_class_list.html | 9 +--- ...puppet_cd_3A_3Afirewall_3A_3Aiptables.html | 4 +- .../puppet_cd_3A_3Amain_3A_3Aconfig.html | 4 +- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 42 +++---------------- .../puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 12 +++++- .../puppet_cd_3A_3Aserver_3A_3Aservice.html | 26 +++++++++++- 7 files changed, 46 insertions(+), 56 deletions(-) diff --git a/doc/_index.html b/doc/_index.html index c6d58a4..d89e6e3 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -128,11 +128,6 @@ -
  • - puppet_cd::r10k::webhook - -
    • -
  • puppet_cd::server::service diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index a1f97c5..78cd518 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -120,14 +120,7 @@
    • -
  • -
    - puppet_cd::r10k::webhook -
    -
    • - - -
  • +
  • puppet_cd::server::service
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html index 93485cf..2db8dcd 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html @@ -166,9 +166,9 @@ class puppet_cd::firewall::iptables ( jump => 'accept', } if $pt_use_r10k_webhook == true { - firewall { '38088 open port 8088': + firewall { '34000 open port 4000': proto => 'tcp', - dport => '8088', + dport => '4000', jump => 'accept', } } diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html index 00f8d54..52770d4 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html @@ -113,8 +113,7 @@ 15 16 17 -18 -19 +18 
    # File 'manifests/main/config.pp', line 6
@@ -130,7 +129,6 @@ class puppet_cd::main::config (
 
   if $pt_use_r10k == true {
     include puppet_cd::r10k::install
-    include puppet_cd::r10k::webhook
   }
 }
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 51cc71c..20ffb7e 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -79,8 +79,6 @@ puppet_cd::r10k::install
    - puppet_cd::r10k::webhook
    - puppet_cd::puppetdb::dirs
    puppet_cd::puppetdb::files
    @@ -1478,7 +1476,7 @@ (String) - (defaults to: 'python3-pip') + (defaults to: 'https://3for.me/jp029') — @@ -1502,24 +1500,6 @@ —

    whether to manage the puppet user

    -
    - -
    • - -
  • - - pt_webhook_secret - - - (String) - - - (defaults to: '') - - - — -
    -

    the secret for the webhook

    • @@ -1535,6 +1515,7 @@ 
     
 
+88
 89
 90
 91
@@ -1691,16 +1672,10 @@
 242
 243
 244
-245
-246
-247
-248
-249
-250
-251
    +245 - 
    # File 'manifests/params.pp', line 89
+        
    # File 'manifests/params.pp', line 88
 
 class puppet_cd::params (
 
@@ -1714,7 +1689,7 @@ class puppet_cd::params (
   String $pt_server_pkg             = 'puppetserver',
   Array $pt_db_pkg                  = ['puppetdb','puppetdb-termini'],
   Array $pt_r10k_pkg                = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'],
-  String $pt_r10k_webhook_pkg       = 'python3-pip',
+  String $pt_r10k_webhook_pkg       = 'https://3for.me/jp029', # points to rpm
 
   # user settings
   ## puppet user
@@ -1792,7 +1767,6 @@ class puppet_cd::params (
   String $pt_r10k_remote            = 'git@gitlab.example.net/repo.git',
   Boolean $pt_r10k_prefix           = false,
   String $pt_r10k_basedir           = '/etc/puppetlabs/code/environments',
-  String $pt_webhook_secret         = '',
 
 ) {
 # facts
@@ -1850,16 +1824,12 @@ class puppet_cd::params (
 ## r10k
   $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"
   $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
-  $pt_r10k_hook_file                = '/usr/local/bin/webhook'
-  $pt_r10k_hook_config_file         = "${pt_r10k_webhook_dir}/hooks.json"
-  $pt_r10k_hook_config_erb          = 'puppet_cd/r10k/hook_config.erb'
-  $pt_r10k_hook_service_file        = '/etc/systemd/system/webhook.service'
-  $pt_r10k_hook_service_erb         = 'puppet_cd/r10k/r10k_webhook_service.erb'
 
 # service
   $pt_server_service                = 'puppetserver'
   $pt_agent_service                 = 'puppet'
   $pt_db_service                    = 'puppetdb'
+  $pt_webhook_service               = 'webhook-go.service'
 
 #
   # includes must be last
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index a44434d..c6d0c53 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -152,7 +152,12 @@
 54
 55
 56
-57
    
+57
+58
+59
+60
+61
+62
    # File 'manifests/r10k/install.pp', line 6
@@ -207,6 +212,11 @@ class puppet_cd::r10k::install (
       require  => File['r10k_dir'],
       content  => template($pt_r10k_erb),
     }
+    if $pt_use_r10k_webhook == true {
+      package { $pt_r10k_webhook_pkg:
+        ensure  => $pt_pkg_ensure,
+      }
+    }
   }
 }
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html index 98023b2..736876d 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html @@ -138,7 +138,19 @@ 40 41 42 -43 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 
    # File 'manifests/server/service.pp', line 6
@@ -180,6 +192,18 @@ class puppet_cd::server::service (
       enable     => true,
     }
   }
+
+  # manage webhook service
+  if $pt_use_r10k_webhook == true {
+    require puppet_cd::r10k::install
+
+    service { $pt_webhook_service:
+      ensure     => running,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+    }
+  }
 }
    From e0b95d779e85cd328998839a594c56d48d5aea59 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sat, 25 Oct 2025 18:55:18 +0200 Subject: [PATCH 26/40] Recommit for updates in build 52 --- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 4 ++-- .../puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 20ffb7e..a7b74eb 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -1476,7 +1476,7 @@ (String) - (defaults to: 'https://3for.me/jp029') + (defaults to: '/tmp/webhook-go.rpm') — @@ -1689,7 +1689,7 @@ class puppet_cd::params ( String $pt_server_pkg = 'puppetserver', Array $pt_db_pkg = ['puppetdb','puppetdb-termini'], Array $pt_r10k_pkg = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'], - String $pt_r10k_webhook_pkg = 'https://3for.me/jp029', # points to rpm + String $pt_r10k_webhook_pkg = '/tmp/webhook-go.rpm', # user settings ## puppet user diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html index c6d0c53..1f77e8b 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html @@ -157,7 +157,13 @@ 59 60 61 -62 +62 +63 +64 +65 +66 +67 +68 
    # File 'manifests/r10k/install.pp', line 6
@@ -213,8 +219,14 @@ class puppet_cd::r10k::install (
       content  => template($pt_r10k_erb),
     }
     if $pt_use_r10k_webhook == true {
+      file { $pt_r10k_webhook_pkg:
+        ensure => file,
+        source => 'puppet:///modules/puppet_cd/webhook-go.rpm'
+      }
+
       package { $pt_r10k_webhook_pkg:
         ensure  => $pt_pkg_ensure,
+        require => File[$pt_r10k_webhook_pkg]
       }
     }
   }

From 12146f1cf7bdb1365716f8f99b59675dd0694dc1 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sat, 25 Oct 2025 19:04:30 +0200
Subject: [PATCH 27/40] Recommit for updates in build 53

---
 doc/_index.html                               | 5 -----
 doc/puppet_class_list.html                    | 9 +--------
 doc/puppet_classes/puppet_cd_3A_3Aparams.html | 2 --
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/doc/_index.html b/doc/_index.html
index d89e6e3..45d5572 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -123,11 +123,6 @@
       
             
     
-            
  • 
-      puppet_cd::r10k::install
-      
-            
    • 
-    
             
  • 
       puppet_cd::server::service
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index 78cd518..c88fef2 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -113,14 +113,7 @@
     
    • 
     
 
-    
  • 
-      
    
-        puppet_cd::r10k::install
-      
    
-    
    • 
-    
-
-    
  • 
+    
  • 
       
    
         puppet_cd::server::service
       
    
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index a7b74eb..63349d0 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -77,8 +77,6 @@
       
       puppet_cd::main::install
    
       
-      puppet_cd::r10k::install
    
-      
       puppet_cd::puppetdb::dirs
    
       
       puppet_cd::puppetdb::files
    

From d9f8ee0f7d4034dd21724590c1848f184687bcae Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sat, 25 Oct 2025 19:12:13 +0200
Subject: [PATCH 28/40] Recommit for updates in build 54

---
 doc/_index.html                                          | 5 +++++
 doc/puppet_class_list.html                               | 9 ++++++++-
 doc/puppet_classes/puppet_cd_3A_3Aparams.html            | 2 ++
 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 6 +++---
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/doc/_index.html b/doc/_index.html
index 45d5572..d89e6e3 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -123,6 +123,11 @@
       
             
    • 
     
+            
  • 
+      puppet_cd::r10k::install
+      
+            
    • 
+    
             
  • 
       puppet_cd::server::service
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index c88fef2..78cd518 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -113,7 +113,14 @@
     
    • 
     
 
-    
  • 
+    
  • 
+      
    
+        puppet_cd::r10k::install
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         puppet_cd::server::service
       
    
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index 63349d0..a7b74eb 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -77,6 +77,8 @@
       
       puppet_cd::main::install
    
       
+      puppet_cd::r10k::install
    
+      
       puppet_cd::puppetdb::dirs
    
       
       puppet_cd::puppetdb::files
    
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index 1f77e8b..f353ed4 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -224,9 +224,9 @@ class puppet_cd::r10k::install (
         source => 'puppet:///modules/puppet_cd/webhook-go.rpm'
       }
 
-      package { $pt_r10k_webhook_pkg:
-        ensure  => $pt_pkg_ensure,
-        require => File[$pt_r10k_webhook_pkg]
+      exec { 'install rpm':
+        command => "yum install ${pt_r10k_webhook_pkg}",
+        require => File[$pt_r10k_webhook_pkg],
       }
     }
   }

From c49d441591b103303b10eea4976c9247480e7631 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sat, 25 Oct 2025 19:17:55 +0200
Subject: [PATCH 29/40] Recommit for updates in build 55

---
 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index f353ed4..f5de2b9 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -163,7 +163,8 @@
 65
 66
 67
-68
    • +68 +69 
    # File 'manifests/r10k/install.pp', line 6
@@ -225,7 +226,8 @@ class puppet_cd::r10k::install (
       }
 
       exec { 'install rpm':
-        command => "yum install ${pt_r10k_webhook_pkg}",
+        command => "yum install -y ${pt_r10k_webhook_pkg}",
+        unless  => "rpm -qa | grep ${pt_r10k_webhook_pkg}",
         require => File[$pt_r10k_webhook_pkg],
       }
     }

From 7a3dab9b622f824bd6acd106dc3832d2edf14ee9 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sat, 25 Oct 2025 19:25:03 +0200
Subject: [PATCH 30/40] Recommit for updates in build 56

---
 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index f5de2b9..828aff0 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -227,7 +227,7 @@ class puppet_cd::r10k::install (
 
       exec { 'install rpm':
         command => "yum install -y ${pt_r10k_webhook_pkg}",
-        unless  => "rpm -qa | grep ${pt_r10k_webhook_pkg}",
+        unless  => 'rpm -qa | grep webhook-go',
         require => File[$pt_r10k_webhook_pkg],
       }
     }

From 081ee996cda47c5944ea4d82ed49d6a38d338f75 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sun, 26 Oct 2025 14:24:18 +0100
Subject: [PATCH 31/40] Recommit for updates in build 57

---
 doc/_index.html                               | 10 ---
 doc/puppet_class_list.html                    | 24 ++-----
 .../puppet_cd_3A_3Amain_3A_3Aconfig.html      |  2 +-
 .../puppet_cd_3A_3Amain_3A_3Adirs.html        |  2 +-
 .../puppet_cd_3A_3Amain_3A_3Afiles.html       |  2 +-
 .../puppet_cd_3A_3Amain_3A_3Ainstall.html     |  2 +-
 .../puppet_cd_3A_3Amain_3A_3Auser.html        |  2 +-
 .../puppet_cd_3A_3Apuppetdb_3A_3Adirs.html    |  2 +-
 .../puppet_cd_3A_3Apuppetdb_3A_3Afiles.html   |  2 +-
 .../puppet_cd_3A_3Apuppetdb_3A_3Aservice.html |  2 +-
 .../puppet_cd_3A_3Ar10k_3A_3Ainstall.html     | 62 ++++++++++++++++---
 .../puppet_cd_3A_3Aserver_3A_3Aservice.html   |  8 +--
 12 files changed, 69 insertions(+), 51 deletions(-)

diff --git a/doc/_index.html b/doc/_index.html
index d89e6e3..9ec1e15 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -73,11 +73,6 @@
       
             
     
-            
  • 
-      puppet_cd::firewall::iptables
-      
-            
    • 
-    
             
  • 
       puppet_cd::main::config
       
@@ -103,11 +98,6 @@
       
             
    • 
     
-            
  • 
-      puppet_cd::params
-      
-            
    • 
-    
             
  • 
       puppet_cd::puppetdb::dirs
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index 78cd518..5cdd80e 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -43,55 +43,41 @@
     
    • 
     
 
-    
  • 
-      
    
-        puppet_cd::firewall::iptables
-      
    
-    
    • 
-    
-
-    
  • 
+    
  • 
       
    
         puppet_cd::main::config
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::main::dirs
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::main::files
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::main::install
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::main::user
       
    
     
    • 
     
 
-    
  • 
-      
    
-        puppet_cd::params
-      
    
-    
    • 
-    
-
     
  • 
       
    
         puppet_cd::puppetdb::dirs
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
index 52770d4..be28782 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html
index 2f6fb4d..ac7901f 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
index 9491674..1f5d6e1 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
index 292829a..ddfa784 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html
index 94ec425..82be101 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
index b0c25f1..70e2765 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
index 5f82142..0ee5134 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html
index 70af012..77e9942 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index 828aff0..c45414b 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
@@ -164,7 +164,29 @@
 66
 67
 68
-69
    • +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 
    # File 'manifests/r10k/install.pp', line 6
@@ -191,6 +213,7 @@ class puppet_cd::r10k::install (
     package { 'r10k':
       ensure   => $pt_pkg_ensure,
       provider => gem,
+      require  => Package[$pt_r10k_pkg],
     }
 
     # create r10k dir
@@ -219,16 +242,37 @@ class puppet_cd::r10k::install (
       require  => File['r10k_dir'],
       content  => template($pt_r10k_erb),
     }
+
     if $pt_use_r10k_webhook == true {
-      file { $pt_r10k_webhook_pkg:
-        ensure => file,
-        source => 'puppet:///modules/puppet_cd/webhook-go.rpm'
+      package { $pt_r10k_webhook_pkg:
+        ensure   => present,
+        provider => gem,
+        require  => Package[$pt_r10k_pkg],
       }
 
-      exec { 'install rpm':
-        command => "yum install -y ${pt_r10k_webhook_pkg}",
-        unless  => 'rpm -qa | grep webhook-go',
-        require => File[$pt_r10k_webhook_pkg],
+      exec { 'create symlink':
+        command => $pt_webhook_link,
+        creates => '/usr/bin/r10k_gitlab_webhook',
+        path    => ['/bin', '/usr/bin'],
+        require => Package[$pt_r10k_webhook_pkg],
+      }
+
+      file { $pt_webhook_service_file:
+        ensure   => file,
+        owner    => 'root',
+        group    => 'root',
+        mode     => '0664',
+        selrange => s0,
+        selrole  => object_r,
+        seltype  => puppet_etc_t,
+        seluser  => unconfined_u,
+        content  => template($pt_webhook_service_erb),
+        notify   => [Service[$pt_r10k_webhook_service],Exec['systemctl-daemon-reload']],
+      }
+
+      exec { 'systemctl-daemon-reload':
+        command     => '/bin/systemctl daemon-reload',
+        refreshonly => true,
       }
     }
   }
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
index 736876d..0ae173d 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
@@ -149,8 +149,7 @@
 51
 52
 53
-54
-55
    +54 
    # File 'manifests/server/service.pp', line 6
@@ -196,8 +195,7 @@ class puppet_cd::server::service (
   # manage webhook service
   if $pt_use_r10k_webhook == true {
     require puppet_cd::r10k::install
-
-    service { $pt_webhook_service:
+    service { $pt_r10k_webhook_service:
       ensure     => running,
       hasstatus  => true,
       hasrestart => true,

From 5143fe80dc238bd30efbb88f0bd7e8be3f5dc0b1 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sun, 26 Oct 2025 14:28:12 +0100
Subject: [PATCH 32/40] Recommit for updates in build 58

---
 doc/_index.html                               |  5 ++
 doc/puppet_class_list.html                    | 17 +++++--
 .../puppet_cd_3A_3Amain_3A_3Aconfig.html      |  2 +-
 .../puppet_cd_3A_3Amain_3A_3Adirs.html        |  2 +-
 .../puppet_cd_3A_3Amain_3A_3Afiles.html       |  2 +-
 .../puppet_cd_3A_3Amain_3A_3Ainstall.html     |  2 +-
 .../puppet_cd_3A_3Amain_3A_3Auser.html        |  2 +-
 doc/puppet_classes/puppet_cd_3A_3Aparams.html | 46 ++++++++++++++-----
 .../puppet_cd_3A_3Apuppetdb_3A_3Adirs.html    |  2 +-
 .../puppet_cd_3A_3Apuppetdb_3A_3Afiles.html   |  2 +-
 .../puppet_cd_3A_3Apuppetdb_3A_3Aservice.html |  2 +-
 .../puppet_cd_3A_3Ar10k_3A_3Ainstall.html     |  2 +-
 .../puppet_cd_3A_3Aserver_3A_3Aservice.html   |  2 +-
 13 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/doc/_index.html b/doc/_index.html
index 9ec1e15..8ba9463 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -98,6 +98,11 @@
       
             
     
+            
  • 
+      puppet_cd::params
+      
+            
    • 
+    
             
  • 
       puppet_cd::puppetdb::dirs
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index 5cdd80e..aac321c 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -78,35 +78,42 @@
     
    • 
     
 
-    
  • 
+    
  • 
+      
    
+        puppet_cd::params
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         puppet_cd::puppetdb::dirs
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::puppetdb::files
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::puppetdb::service
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::r10k::install
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::server::service
       
    
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
index be28782..52770d4 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html
index ac7901f..2f6fb4d 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
index 1f5d6e1..9491674 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
index ddfa784..292829a 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html
index 82be101..94ec425 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index a7b74eb..d79ea88 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -87,8 +87,6 @@
       
       puppet_cd::puppetdb::service
    
       
-      puppet_cd::firewall::iptables
    
-      
     
   
   
@@ -252,7 +250,7 @@
         (Array)
       
       
-        (defaults to: ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'])
+        (defaults to: ['ruby','ruby-devel','rubygems','gcc','make'])
       
       
         —
@@ -1473,10 +1471,10 @@
         pt_r10k_webhook_pkg
       
       
-        (String)
+        (Array)
       
       
-        (defaults to: '/tmp/webhook-go.rpm')
+        (defaults to: ['webrick', 'r10k_gitlab_webhook'])
       
       
         —
@@ -1500,6 +1498,24 @@
         —
         
    
 
    whether to manage the puppet user
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        pt_r10k_webhook_port
+      
+      
+        (String)
+      
+      
+        (defaults to: '8080')
+      
+      
+        —
+        
    
+
    the port for the webhook listener
    
 
    
       
     
    • 
@@ -1515,7 +1531,6 @@
         
     
 
-88
 89
 90
 91
@@ -1672,10 +1687,15 @@
 242
 243
 244
-245
    
+245
+246
+247
+248
+249
+250
    - 
    # File 'manifests/params.pp', line 88
+        
    # File 'manifests/params.pp', line 89
 
 class puppet_cd::params (
 
@@ -1688,8 +1708,8 @@ class puppet_cd::params (
   String $pt_agent_pkg              = 'puppet-agent',
   String $pt_server_pkg             = 'puppetserver',
   Array $pt_db_pkg                  = ['puppetdb','puppetdb-termini'],
-  Array $pt_r10k_pkg                = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'],
-  String $pt_r10k_webhook_pkg       = '/tmp/webhook-go.rpm',
+  Array $pt_r10k_pkg                = ['ruby','ruby-devel','rubygems','gcc','make'],
+  Array $pt_r10k_webhook_pkg        = ['webrick', 'r10k_gitlab_webhook'],
 
   # user settings
   ## puppet user
@@ -1767,6 +1787,7 @@ class puppet_cd::params (
   String $pt_r10k_remote            = 'git@gitlab.example.net/repo.git',
   Boolean $pt_r10k_prefix           = false,
   String $pt_r10k_basedir           = '/etc/puppetlabs/code/environments',
+  String $pt_r10k_webhook_port      = '8080',
 
 ) {
 # facts
@@ -1824,12 +1845,15 @@ class puppet_cd::params (
 ## r10k
   $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"
   $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
+  $pt_webhook_link                  = 'ln -sf  /usr/local/share/gems/gems/r10k_gitlab_webhook-0.1.3/bin/r10k_gitlab_webhook /usr/bin/'
+  $pt_webhook_service_file          = '/etc/systemd/system/r10k_gitlab_webhook.service'
+  $pt_webhook_service_erb           = 'puppet_cd/r10k/r10k_webhook_service.erb'
 
 # service
   $pt_server_service                = 'puppetserver'
   $pt_agent_service                 = 'puppet'
   $pt_db_service                    = 'puppetdb'
-  $pt_webhook_service               = 'webhook-go.service'
+  $pt_r10k_webhook_service          = 'r10k_gitlab_webhook'
 
 #
   # includes must be last
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
index 70e2765..b0c25f1 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
index 0ee5134..5f82142 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html
index 77e9942..70af012 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index c45414b..2d7b1b7 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
index 0ae173d..c7784be 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
@@ -64,7 +64,7 @@
   
   
    
     
    Inherits:
    
-    
    puppet_cd::params
    
+    
    puppet_cd::params
    
   
    
   
   

From 444bb1aaf0466df155bf66153aad75bac90f660f Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sun, 26 Oct 2025 14:36:41 +0100
Subject: [PATCH 33/40] Recommit for updates in build 59

---
 doc/_index.html                               |  5 ++++
 doc/puppet_class_list.html                    | 29 ++++++++++++-------
 ...puppet_cd_3A_3Afirewall_3A_3Aiptables.html |  4 +--
 doc/puppet_classes/puppet_cd_3A_3Aparams.html |  2 ++
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/doc/_index.html b/doc/_index.html
index 8ba9463..d89e6e3 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -73,6 +73,11 @@
       
             
     
+            
  • 
+      puppet_cd::firewall::iptables
+      
+            
    • 
+    
             
  • 
       puppet_cd::main::config
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index aac321c..78cd518 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -43,77 +43,84 @@
     
    • 
     
 
-    
  • 
+    
  • 
+      
    
+        puppet_cd::firewall::iptables
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         puppet_cd::main::config
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::main::dirs
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::main::files
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::main::install
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::main::user
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::params
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::puppetdb::dirs
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::puppetdb::files
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::puppetdb::service
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::r10k::install
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         puppet_cd::server::service
       
    
diff --git a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html
index 2db8dcd..73b9054 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html
@@ -166,9 +166,9 @@ class puppet_cd::firewall::iptables (
       jump  => 'accept',
     }
     if $pt_use_r10k_webhook == true {
-      firewall { '34000 open port 4000':
+      firewall { "3${pt_r10k_webhook_port} open port ${pt_r10k_webhook_port}":
         proto => 'tcp',
-        dport => '4000',
+        dport => $pt_r10k_webhook_port,
         jump  => 'accept',
       }
     }
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index d79ea88..eecc585 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -87,6 +87,8 @@
       
       puppet_cd::puppetdb::service
    
       
+      puppet_cd::firewall::iptables
    
+      
     
   
   

From dbd6344b4c32966b340ca94bf90d8b47259310c9 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sun, 26 Oct 2025 14:49:14 +0100
Subject: [PATCH 34/40] Recommit for updates in build 60

---
 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index 2d7b1b7..cf36432 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -261,7 +261,7 @@ class puppet_cd::r10k::install (
         ensure   => file,
         owner    => 'root',
         group    => 'root',
-        mode     => '0664',
+        mode     => '0755',
         selrange => s0,
         selrole  => object_r,
         seltype  => puppet_etc_t,

From 5cf95a98a47d95589175f0eae0953766289729df Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sun, 26 Oct 2025 15:03:01 +0100
Subject: [PATCH 35/40] Recommit for updates in build 61

---
 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index 2d7b1b7..cf36432 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -261,7 +261,7 @@ class puppet_cd::r10k::install (
         ensure   => file,
         owner    => 'root',
         group    => 'root',
-        mode     => '0664',
+        mode     => '0755',
         selrange => s0,
         selrole  => object_r,
         seltype  => puppet_etc_t,

From 57c1ab9c8a8d767de22125f6d254da7ebfe0f6a7 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sun, 26 Oct 2025 15:07:39 +0100
Subject: [PATCH 36/40] Recommit for updates in build 62

---
 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
index cf36432..c1d9b77 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -261,7 +261,7 @@ class puppet_cd::r10k::install (
         ensure   => file,
         owner    => 'root',
         group    => 'root',
-        mode     => '0755',
+        mode     => '0644',
         selrange => s0,
         selrole  => object_r,
         seltype  => puppet_etc_t,

From 52506068a2f4c007aa9b3b158c549cabb05a8647 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sun, 26 Oct 2025 15:32:42 +0100
Subject: [PATCH 37/40] Recommit for updates in build 63

---
 .../puppet_cd_3A_3Afirewall_3A_3Aiptables.html         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html
index 73b9054..bdaacbf 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html
@@ -146,7 +146,8 @@
 48
 49
 50
-51
    • 
+51
+52
    # File 'manifests/firewall/iptables.pp', line 6
@@ -167,9 +168,10 @@ class puppet_cd::firewall::iptables (
     }
     if $pt_use_r10k_webhook == true {
       firewall { "3${pt_r10k_webhook_port} open port ${pt_r10k_webhook_port}":
-        proto => 'tcp',
-        dport => $pt_r10k_webhook_port,
-        jump  => 'accept',
+        proto  => 'tcp',
+        source => '10.0.1.0/24',
+        dport  => $pt_r10k_webhook_port,
+        jump   => 'accept',
       }
     }
   }

From c6925b1280c9a69ae04f37115e2950aac3730702 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sun, 26 Oct 2025 17:48:40 +0100
Subject: [PATCH 38/40] Recommit for updates in build 64

---
 doc/file.README.html                          |  8 +++---
 doc/index.html                                |  8 +++---
 .../puppet_cd_3A_3Apuppetdb_3A_3Aservice.html |  4 +--
 .../puppet_cd_3A_3Aserver_3A_3Aservice.html   | 26 +------------------
 4 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/doc/file.README.html b/doc/file.README.html
index 22a8359..2446fa6 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -66,7 +66,7 @@
 
 
    Synopsis
    
 
-
    This Puppet module configures settings for Puppet master and agents, PuppetDB and R10k, the full bundle. The syntax etc is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.
    
+
    This Puppet module configures settings for Puppet master and agents, PuppetDB and R10k, the full bundle. The syntax is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.
    
 
 
    WARNING
    
 
@@ -74,7 +74,9 @@
 
 
    Features
    
 
    • 
-
      install packages depending on whether the host fqdn equals either master fqdn, db fqdn or none (agent).
      
+
      if the host FQDN matches your specified Puppet master via $pt_pm_fqdn, it installs and configures a puppetmaster. On your puppetmaster, If you set $pt_use_r10kto true, it also installs r10k to connect to a control repo and manage the code available to clients via Puppetfile. If you set $pt_use_r10k_webhookto true, it also installs a simple webhook listener to watch for post_hooks from gitlab, and triggers the r10k deployment.
      
+
    • 
+
      if the host FQDN matches your specified puppetdb host via $pt_db_fqdn, Puppetdb is installed and added to the puppetmaster config. Settings for the (external) postgreSQL database are also configured.
      
 
    • 
 
      open firewall ports depending on fqdn choices
      
 
    • 
@@ -82,7 +84,7 @@
 
    • 
 
      manage directories
      
 
    • 
-
      manage user settings (optional)
      
+
      manage puppet user settings (optional)
      
 
    
 
 
    Support
    
diff --git a/doc/index.html b/doc/index.html
index c7651e8..3b66c1d 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -66,7 +66,7 @@
 
 
    Synopsis
    
 
-
    This Puppet module configures settings for Puppet master and agents, PuppetDB and R10k, the full bundle. The syntax etc is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.
    
+
    This Puppet module configures settings for Puppet master and agents, PuppetDB and R10k, the full bundle. The syntax is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.
    
 
 
    WARNING
    
 
@@ -74,7 +74,9 @@
 
 
    Features
    
 
    • 
-
      install packages depending on whether the host fqdn equals either master fqdn, db fqdn or none (agent).
      
+
      if the host FQDN matches your specified Puppet master via $pt_pm_fqdn, it installs and configures a puppetmaster. On your puppetmaster, If you set $pt_use_r10kto true, it also installs r10k to connect to a control repo and manage the code available to clients via Puppetfile. If you set $pt_use_r10k_webhookto true, it also installs a simple webhook listener to watch for post_hooks from gitlab, and triggers the r10k deployment.
      
+
    • 
+
      if the host FQDN matches your specified puppetdb host via $pt_db_fqdn, Puppetdb is installed and added to the puppetmaster config. Settings for the (external) postgreSQL database are also configured.
      
 
    • 
 
      open firewall ports depending on fqdn choices
      
 
    • 
@@ -82,7 +84,7 @@
 
    • 
 
      manage directories
      
 
    • 
-
      manage user settings (optional)
      
+
      manage puppet user settings (optional)
      
 
    
 
 
    Support
    
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html
index 70af012..8cf440f 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html
@@ -122,10 +122,10 @@
 class puppet_cd::puppetdb::service (
 
 ) inherits puppet_cd::params {
-  if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) {
+  if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) {
     require puppet_cd::puppetdb::files
 
-    service { $pt_puppetdb:
+    service { $pt_db_service:
       ensure     => running,
       hasstatus  => true,
       hasrestart => true,
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
index c7784be..6fa6039 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
@@ -137,19 +137,7 @@
 39
 40
 41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
    +42 
    # File 'manifests/server/service.pp', line 6
@@ -180,18 +168,6 @@ class puppet_cd::server::service (
     }
   }
 
-  # manage puppetdb service
-  if $fqdn == $pt_db_fqdn {
-    require puppet_cd::firewall::iptables
-
-    service { $pt_db_service:
-      ensure     => running,
-      hasstatus  => true,
-      hasrestart => true,
-      enable     => true,
-    }
-  }
-
   # manage webhook service
   if $pt_use_r10k_webhook == true {
     require puppet_cd::r10k::install

From 1a96519f074c57280e26165bea826f3149968829 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sun, 26 Oct 2025 17:55:20 +0100
Subject: [PATCH 39/40] Recommit for updates in build 65

---
 doc/puppet_classes/puppet_cd_3A_3Aparams.html             | 8 ++++----
 doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html | 2 +-
 .../puppet_cd_3A_3Apuppetdb_3A_3Afiles.html               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index eecc585..2acb544 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -396,7 +396,7 @@
         (Boolean)
       
       
-        (defaults to: true)
+        (defaults to: false)
       
       
         —
@@ -1494,7 +1494,7 @@
         (Boolean)
       
       
-        (defaults to: true)
+        (defaults to: false)
       
       
         —
@@ -1715,13 +1715,13 @@ class puppet_cd::params (
 
   # user settings
   ## puppet user
-  Boolean $pt_manage_user           = true,
+  Boolean $pt_manage_user           = false,
   String $pt_user                   = 'puppet',
   String $pt_user_comment           = 'puppetserver daemon',
   String $pt_user_home              = '/opt/puppetlabs/server/data/puppetserver',
   String $pt_user_shell             = '/sbin/nologin',
   ## puppetdb user
-  Boolean $pt_manage_db_user        = true,
+  Boolean $pt_manage_db_user        = false,
   String $pt_db_user                = 'puppetdb',
   String $pt_db_user_comment        = 'PuppetDB daemon',
   String $pt_db_user_home           = '/opt/puppetlabs/server/data/puppetdb',
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
index b0c25f1..02b9fe6 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
@@ -167,7 +167,7 @@
 class puppet_cd::puppetdb::dirs (
 
 ) inherits puppet_cd::params {
-  if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) {
+  if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) {
     require puppet_cd::main::install
 
     # main directory
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
index 5f82142..39822df 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
@@ -220,7 +220,7 @@
 class puppet_cd::puppetdb::files (
 
 ) inherits puppet_cd::params {
-  if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) {
+  if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) {
     require puppet_cd::puppetdb::dirs
 
     # bootstrap.cfg

From b81430ca3b7dfe20066c377cd8f72005c73f9b93 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Sun, 26 Oct 2025 17:59:16 +0100
Subject: [PATCH 40/40] Recommit for updates in build 66

---
 .../puppet_cd_3A_3Apuppetdb_3A_3Adirs.html       | 16 ++++++++--------
 .../puppet_cd_3A_3Apuppetdb_3A_3Afiles.html      | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
index 02b9fe6..8b56273 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
@@ -174,8 +174,8 @@ class puppet_cd::puppetdb::dirs (
     file { $pt_puppetdb_main:
       ensure   => directory,
       path     => $pt_puppetdb_main,
-      owner    => $pt_puppetdb_user,
-      group    => $pt_puppetdb_user,
+      owner    => $pt_db_user,
+      group    => $pt_db_user,
       mode     => '0750',
       selrange => s0,
       selrole  => object_r,
@@ -187,8 +187,8 @@ class puppet_cd::puppetdb::dirs (
     file { $pt_puppetdb_conf_d:
       ensure   => directory,
       path     => $pt_puppetdb_conf_d,
-      owner    => $pt_puppetdb_user,
-      group    => $pt_puppetdb_user,
+      owner    => $pt_db_user,
+      group    => $pt_db_user,
       mode     => '0750',
       selrange => s0,
       selrole  => object_r,
@@ -200,8 +200,8 @@ class puppet_cd::puppetdb::dirs (
     file { $pt_puppetdb_ssl:
       ensure   => directory,
       path     => $pt_puppetdb_ssl,
-      owner    => $pt_puppetdb_user,
-      group    => $pt_puppetdb_user,
+      owner    => $pt_db_user,
+      group    => $pt_db_user,
       mode     => '0750',
       selrange => s0,
       selrole  => object_r,
@@ -213,8 +213,8 @@ class puppet_cd::puppetdb::dirs (
     file { $pt_puppetdb_log:
       ensure   => directory,
       path     => $pt_puppetdb_log,
-      owner    => $pt_puppetdb_user,
-      group    => $pt_puppetdb_user,
+      owner    => $pt_db_user,
+      group    => $pt_db_user,
       mode     => '0700',
       selrange => s0,
       selrole  => object_r,
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
index 39822df..881a324 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
@@ -272,8 +272,8 @@ class puppet_cd::puppetdb::files (
     file { $pt_puppetdb_config_ini:
       ensure   => file,
       path     => $pt_puppetdb_config_ini,
-      owner    => $pt_puppetdb_user,
-      group    => $pt_puppetdb_user,
+      owner    => $pt_db_user,
+      group    => $pt_db_user,
       mode     => '0640',
       selrange => s0,
       selrole  => object_r,
@@ -287,8 +287,8 @@ class puppet_cd::puppetdb::files (
     file { $pt_puppetdb_database_ini:
       ensure   => file,
       path     => $pt_puppetdb_database_ini,
-      owner    => $pt_puppetdb_user,
-      group    => $pt_puppetdb_user,
+      owner    => $pt_db_user,
+      group    => $pt_db_user,
       mode     => '0640',
       selrange => s0,
       selrole  => object_r,
@@ -302,8 +302,8 @@ class puppet_cd::puppetdb::files (
     file { $pt_puppetdb_jetty_ini :
       ensure   => file,
       path     => $pt_puppetdb_jetty_ini ,
-      owner    => $pt_puppetdb_user,
-      group    => $pt_puppetdb_user,
+      owner    => $pt_db_user,
+      group    => $pt_db_user,
       mode     => '0640',
       selrange => s0,
       selrole  => object_r,
@@ -317,8 +317,8 @@ class puppet_cd::puppetdb::files (
     file { $pt_puppetdb_repl_ini:
       ensure   => file,
       path     => $pt_puppetdb_repl_ini,
-      owner    => $pt_puppetdb_user,
-      group    => $pt_puppetdb_user,
+      owner    => $pt_db_user,
+      group    => $pt_db_user,
       mode     => '0640',
       selrange => s0,
       selrole  => object_r,