recommit for updates in build 4

This commit is contained in:
Jenkins ConfDroid
2018-12-10 14:39:32 +01:00
parent e18c4131ef
commit 19592e5d19
15 changed files with 576 additions and 73 deletions

View File

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
<h2> No issue </h2>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/672d9954a008213">672d9954a008213</a> Jenkins ConfDroid <i>2018-12-07 14:09:55</i>
<p>
<h3>recommit for updates in build 3</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/f1ced15feee499c">f1ced15feee499c</a> Arne Teuke <i>2018-12-07 14:09:13</i>
<p>
<h3>updates Gems and jenkinsfile</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/7f087019d968992">7f087019d968992</a> Jenkins ConfDroid <i>2018-04-24 15:26:20</i>
<p>
<h3>recommit for updates in build 2</h3>

View File

@@ -30,11 +30,15 @@
| | |-- config.pp
| | |-- dirs.pp
| | |-- files.pp
| | `-- install.pp
| | |-- install.pp
| | `-- user.pp
| |-- server
| | |-- proxy.pp
| | `-- service.pp
| |-- init.pp
| `-- params.pp
|-- templates
| `-- haproxy.cfg
|-- tests
| `-- UTF_Files
|-- CHANGELOG.md
@@ -44,4 +48,4 @@
|-- LICENSE
`-- README.md
9 directories, 35 files
10 directories, 38 files

View File

@@ -98,6 +98,11 @@
</li>
<li>
<span class='object_link'><a href="puppet_classes/cd_haproxy_3A_3Amain_3A_3Auser.html" title="puppet_classes::cd_haproxy::main::user (puppet_class)">cd_haproxy::main::user</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/cd_haproxy_3A_3Aparams.html" title="puppet_classes::cd_haproxy::params (puppet_class)">cd_haproxy::params</a></span>
@@ -116,6 +121,30 @@
</table>
<h2>Defined Type Listing A-Z</h2>
<table>
<tr>
<td valign='top' width="33%">
<ul id="alpha_C" class="alpha">
<li class="letter">C</li>
<ul>
<li>
<span class='object_link'><a href="puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html" title="puppet_defined_types::cd_haproxy::server::proxy (puppet_defined_type)">cd_haproxy::server::proxy</a></span>
</li>
</ul>
</ul>
</td>
</tr>
</table>

View File

@@ -197,9 +197,9 @@ selinux is disabled, these contexts are ignored.</p>
<h3 id="label-Support">Support</h3>
<ul><li>
<p>OS: CentOS 6, 7</p>
<p>OS: CentOS 7</p>
</li><li>
<p>Puppet 3.x</p>
<p>Puppet 5.x</p>
</li></ul>
<h3 id="label-Tests">Tests</h3>

View File

@@ -197,9 +197,9 @@ selinux is disabled, these contexts are ignored.</p>
<h3 id="label-Support">Support</h3>
<ul><li>
<p>OS: CentOS 6, 7</p>
<p>OS: CentOS 7</p>
</li><li>
<p>Puppet 3.x</p>
<p>Puppet 5.x</p>
</li></ul>
<h3 id="label-Tests">Tests</h3>

View File

@@ -28,6 +28,10 @@
Puppet Classes
</a></span>
<span><a target="_self" href="puppet_defined_type_list.html">
Defined Types
</a></span>
</div>
<div id="search">Search: <input type="text" /></div>
@@ -78,14 +82,21 @@
</li>
<li id="object_puppet_classes::cd_haproxy::params" class="odd">
<li id="object_puppet_classes::cd_haproxy::main::user" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_haproxy_3A_3Amain_3A_3Auser.html" title="puppet_classes::cd_haproxy::main::user (puppet_class)">cd_haproxy::main::user</a></span>
</div>
</li>
<li id="object_puppet_classes::cd_haproxy::params" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_haproxy_3A_3Aparams.html" title="puppet_classes::cd_haproxy::params (puppet_class)">cd_haproxy::params</a></span>
</div>
</li>
<li id="object_puppet_classes::cd_haproxy::server::service" class="even">
<li id="object_puppet_classes::cd_haproxy::server::service" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::cd_haproxy::server::service (puppet_class)">cd_haproxy::server::service</a></span>
</div>

View File

@@ -136,19 +136,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55</pre>
43</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 23</span>
@@ -161,30 +149,18 @@ class cd_haproxy::firewall::iptables (
require cd_haproxy::main::files
if $hy_proxy_mode == &#39;http&#39; {
firewall { &quot;${hy_fw_order_no}80 tcp port 80&quot;:
firewall { &quot;${hy_fw_order_no}${hy_http_port} tcp port ${hy_http_port}&quot;:
proto =&gt; &#39;tcp&#39;,
dport =&gt; &#39;80&#39;,
dport =&gt; $hy_http_port,
action =&gt; &#39;accept&#39;,
}
}
if $hy_proxy_mode == &#39;tcp&#39; {
firewall { &quot;${hy_fw_order_no}${hy_fe_port} tcp port ${hy_fe_port}&quot;:
firewall { &quot;${hy_fw_order_no}${hy_https_port} tcp port ${hy_https_port}&quot;:
proto =&gt; &#39;tcp&#39;,
dport =&gt; $hy_fe_port,
dport =&gt; $hy_https_port,
action =&gt; &#39;accept&#39;,
}
}
}
if $fqdn == $hy_host_fqdn {
require cd_haproxy::main::files
}
}</pre>
</td>
</tr>

View File

@@ -132,7 +132,7 @@ class cd_haproxy::main::config (
) inherits cd_haproxy::params {
require cd_haproxy::server::service
include cd_haproxy::server::service
}</pre>
</td>

View File

@@ -125,9 +125,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
29
30
31
32
33
34</pre>
32</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 23</span>
@@ -137,9 +135,7 @@ class cd_haproxy::main::dirs (
) inherits cd_haproxy::params {
if $fqdn == $hy_host_fqdn {
require cd_haproxy::main::install
require cd_haproxy::main::user
}

View File

@@ -123,9 +123,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
27
28
29
30
31
32</pre>
30</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 23</span>
@@ -135,9 +133,7 @@ class cd_haproxy::main::files (
) inherits cd_haproxy::params {
if $fqdn == $hy_host_fqdn {
require cd_haproxy::main::dirs
}
}</pre>
</td>

View File

@@ -124,7 +124,9 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
28
29
30
31</pre>
31
32
33</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 24</span>
@@ -133,9 +135,11 @@ class cd_haproxy::main::install (
) inherits cd_haproxy::params {
if $fqdn == $hy_host_fqdn {
package {$reqpackages:
ensure =&gt; $pkg_ensure,
}
}
}</pre>
</td>
</tr>

View File

@@ -0,0 +1,191 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: cd_haproxy::main::user
&mdash; Documentation by YARD 0.9.16
</title>
<link rel="stylesheet" href="../css/style.css" type="text/css" charset="utf-8" />
<link rel="stylesheet" href="../css/common.css" type="text/css" charset="utf-8" />
<script type="text/javascript" charset="utf-8">
pathId = "puppet_classes::cd_haproxy::main::user";
relpath = '../';
</script>
<script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
<script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
</head>
<body>
<div class="nav_wrap">
<iframe id="nav" src="../puppet_class_list.html?1"></iframe>
<div id="resizer"></div>
</div>
<div id="main" tabindex="-1">
<div id="header">
<div id="menu">
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">cd_haproxy::main::user</span>
</div>
<div id="search">
<a class="full_list_link" id="puppet_class_list_link"
href="../puppet_class_list.html">
<svg width="24" height="24">
<rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
<rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
<rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
</svg>
</a>
</div>
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: cd_haproxy::main::user</h1>
<div class="box_info">
<dl>
<dt>Inherits:</dt>
<dd><span class='object_link'><a href="cd_haproxy_3A_3Aparams.html" title="puppet_classes::cd_haproxy::params (puppet_class)">cd_haproxy::params</a></span></dd>
</dl>
<dl>
<dt>Defined in:</dt>
<dd>
manifests/main/user.pp
</dd>
</dl>
</div>
<h2>Summary</h2>
Class manages service users for cd_haproxy.
<h2>Overview</h2>
<div class="docstring">
<div class="discussion">
<p>cd_haproxy::main::user.pp Module name: cd_haproxy Author: Arne Teuke
(arne_teuke@ConfDroid.com)</p>
<h1 id="label-License-3A">License:</h1>
<p>This file is part of cd_haproxy.</p>
<p>cd_haproxy is used for providing automatic configuration of HAproxy
Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com) This program is
free software: you can redistribute it and/or modify it under the terms of
the GNU General Public License as published by the Free Software
Foundation, either version 3 of the License, or (at your option) any later
version.</p>
<p>This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.</p>
<p>You should have received a copy of the GNU General Public License along
with this program. If not, see <a
href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
</div>
</div>
<div class="tags">
</div><div class="method_details_list">
<table class="source_code">
<tr>
<td>
<pre class="lines">
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</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/user.pp', line 23</span>
class cd_haproxy::main::user (
) inherits cd_haproxy::params {
if $fqdn == $hy_host_fqdn {
require cd_haproxy::main::install
# manage user
user { $hy_user:
ensure =&gt; present,
name =&gt; $hy_user,
allowdupe =&gt; false,
comment =&gt; $hy_user_comment,
gid =&gt; $hy_user,
managehome =&gt; true,
home =&gt; $hy_user_home,
shell =&gt; $hy_user_shell,
}
group { $hy_user:
ensure =&gt; present,
name =&gt; $hy_user,
allowdupe =&gt; false,
}
}
}</pre>
</td>
</tr>
</table>
</div>
</div>
<div id="footer">
Generated by <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
</div>
</div>
</body>
</html>

View File

@@ -69,6 +69,8 @@
<span class='object_link'><a href="cd_haproxy_3A_3Amain_3A_3Adirs.html" title="puppet_classes::cd_haproxy::main::dirs (puppet_class)">cd_haproxy::main::dirs</a></span><br/>
<span class='object_link'><a href="cd_haproxy_3A_3Amain_3A_3Auser.html" title="puppet_classes::cd_haproxy::main::user (puppet_class)">cd_haproxy::main::user</a></span><br/>
<span class='object_link'><a href="cd_haproxy_3A_3Amain_3A_3Afiles.html" title="puppet_classes::cd_haproxy::main::files (puppet_class)">cd_haproxy::main::files</a></span><br/>
<span class='object_link'><a href="cd_haproxy_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::cd_haproxy::main::config (puppet_class)">cd_haproxy::main::config</a></span><br/>
@@ -225,8 +227,6 @@ fqdns via array.</p>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;http&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -244,8 +244,6 @@ fqdns via array.</p>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -264,8 +262,6 @@ to <code>tcp</code>.</p>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -275,6 +271,84 @@ to <code>tcp</code>.</p>
</li>
<li>
<span class='name'>hy_http_port</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;80&#39;</tt>)</em>
</li>
<li>
<span class='name'>hy_https_port</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;443&#39;</tt>)</em>
</li>
<li>
<span class='name'>hy_user_name</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;haproxy&#39;</tt>)</em>
</li>
<li>
<span class='name'>hy_user_comment</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;haproxy user&#39;</tt>)</em>
</li>
<li>
<span class='name'>hy_user_home</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/var/lib/haproxy&#39;</tt>)</em>
</li>
<li>
<span class='name'>hy_user_shell</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/sbin/nologin&#39;</tt>)</em>
</li>
</ul>
@@ -313,7 +387,15 @@ to <code>tcp</code>.</p>
65
66
67
68</pre>
68
69
70
71
72
73
74
75
76</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 40</span>
@@ -330,16 +412,24 @@ $hy_manage_fw = true,
$hy_fw_order_no = &#39;50&#39;,
# main config
$hy_proxy_mode = &#39;http&#39;,
$hy_fe_port = &#39;&#39;,
$hy_be_port = &#39;&#39;,
$hy_http_port = &#39;80&#39;,
$hy_https_port = &#39;443&#39;,
# user
$hy_user_name = &#39;haproxy&#39;,
$hy_user_comment = &#39;haproxy user&#39;,
$hy_user_home = &#39;/var/lib/haproxy&#39;,
$hy_user_shell = &#39;/sbin/nologin&#39;,
) {
# service
$hy_service = &#39;haproxy&#39;
# installation section
# directories
# files
# includes must be last

View File

@@ -0,0 +1,54 @@
<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="utf-8" />
<link rel="stylesheet" href="css/full_list.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="css/common.css" type="text/css" media="screen" charset="utf-8" />
<script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
<script type="text/javascript" charset="utf-8" src="js/full_list.js"></script>
<title>Defined Type List</title>
<base id="base_target" target="_parent" />
</head>
<body>
<div id="content">
<div class="fixed_header">
<h1 id="full_list_header">Defined Type List</h1>
<div id="full_list_nav">
<span><a target="_self" href="puppet_class_list.html">
Puppet Classes
</a></span>
<span><a target="_self" href="puppet_defined_type_list.html">
Defined Types
</a></span>
</div>
<div id="search">Search: <input type="text" /></div>
</div>
<ul id="full_list" class="puppet_defined_type">
<li id="object_puppet_defined_types::cd_haproxy::server::proxy" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html" title="puppet_defined_types::cd_haproxy::server::proxy (puppet_defined_type)">cd_haproxy::server::proxy</a></span>
</div>
</li>
</ul>
</div>
</body>
</html>

View File

@@ -0,0 +1,142 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Defined Type: cd_haproxy::server::proxy
&mdash; Documentation by YARD 0.9.16
</title>
<link rel="stylesheet" href="../css/style.css" type="text/css" charset="utf-8" />
<link rel="stylesheet" href="../css/common.css" type="text/css" charset="utf-8" />
<script type="text/javascript" charset="utf-8">
pathId = "puppet_defined_types::cd_haproxy::server::proxy";
relpath = '../';
</script>
<script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
<script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
</head>
<body>
<div class="nav_wrap">
<iframe id="nav" src="../puppet_defined_type_list.html?1"></iframe>
<div id="resizer"></div>
</div>
<div id="main" tabindex="-1">
<div id="header">
<div id="menu">
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Defined Types</span></span>
&raquo;
<span class="title">cd_haproxy::server::proxy</span>
</div>
<div id="search">
<a class="full_list_link" id="puppet_class_list_link"
href="../puppet_class_list.html">
<svg width="24" height="24">
<rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
<rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
<rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
</svg>
</a>
</div>
<div class="clear"></div>
</div>
<div id="content"><h1>Defined Type: cd_haproxy::server::proxy</h1>
<div class="box_info">
<dl>
<dt>Defined in:</dt>
<dd>
manifests/server/proxy.pp
</dd>
</dl>
</div>
<h2>Summary</h2>
Define manages the proxies for cd_haproxy.
<h2>Overview</h2>
<div class="docstring">
<div class="discussion">
<p>cd_haproxy::server::proxy.pp Module name: cd_haproxy Author: Arne Teuke
(arne_teuke@ConfDroid.com)</p>
<h1 id="label-License-3A">License:</h1>
<p>This file is part of cd_haproxy.</p>
<p>cd_haproxy is used for providing automatic configuration of HAProxy
Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com) This program is
free software: you can redistribute it and/or modify it under the terms of
the GNU General Public License as published by the Free Software
Foundation, either version 3 of the License, or (at your option) any later
version.</p>
<p>This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.</p>
<p>You should have received a copy of the GNU General Public License along
with this program. If not, see <a
href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
</div>
</div>
<div class="tags">
</div><div class="method_details_list">
<table class="source_code">
<tr>
<td>
<pre class="lines">
23
24
25
26
27</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/server/proxy.pp', line 23</span>
<span class='id identifier rubyid_define'>define</span> <span class='id identifier rubyid_cd_haproxy'>cd_haproxy</span><span class='op'>::</span><span class='id identifier rubyid_server'>server</span><span class='op'>::</span><span class='id identifier rubyid_proxy'>proxy</span> <span class='lparen'>(</span>
<span class='rparen'>)</span> <span class='lbrace'>{</span>
<span class='rbrace'>}</span></pre>
</td>
</tr>
</table>
</div>
</div>
<div id="footer">
Generated by <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
</div>
</div>
</body>
</html>