recommit for updates in build 42
This commit is contained in:
10
CHANGELOG.md
10
CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
|
||||
<h2> No issue </h2>
|
||||
|
||||
|
||||
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/87603c49c746a9a">87603c49c746a9a</a> Jenkins ConfDroid <i>2019-12-30 16:17:56</i>
|
||||
<p>
|
||||
<h3>recommit for updates in build 41</h3>
|
||||
|
||||
</p>
|
||||
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/6ecca6ef59e5087">6ecca6ef59e5087</a> Arne Teuke <i>2019-12-30 16:17:19</i>
|
||||
<p>
|
||||
<h3>updates README</h3>
|
||||
|
||||
</p>
|
||||
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/1ef93c6e81f9820">1ef93c6e81f9820</a> Jenkins ConfDroid <i>2019-12-30 16:13:15</i>
|
||||
<p>
|
||||
<h3>recommit for updates in build 40</h3>
|
||||
|
||||
@@ -44,6 +44,14 @@
|
||||
| |-- init.pp
|
||||
| `-- params.pp
|
||||
|-- templates
|
||||
| |-- errors
|
||||
| | |-- 400_http.erb
|
||||
| | |-- 403_http.erb
|
||||
| | |-- 408_http.erb
|
||||
| | |-- 500_http.erb
|
||||
| | |-- 502_http.erb
|
||||
| | |-- 503_http.erb
|
||||
| | `-- 504_http.erb
|
||||
| |-- haproxy_acl_rule.erb
|
||||
| |-- haproxy_backend_rule.erb
|
||||
| |-- haproxy.cfg
|
||||
@@ -58,4 +66,4 @@
|
||||
|-- LICENSE
|
||||
`-- README.md
|
||||
|
||||
11 directories, 47 files
|
||||
12 directories, 54 files
|
||||
|
||||
@@ -135,7 +135,19 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
|
||||
39
|
||||
40
|
||||
41
|
||||
42</pre>
|
||||
42
|
||||
43
|
||||
44
|
||||
45
|
||||
46
|
||||
47
|
||||
48
|
||||
49
|
||||
50
|
||||
51
|
||||
52
|
||||
53
|
||||
54</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 23</span>
|
||||
@@ -158,6 +170,18 @@ class cd_haproxy::main::dirs (
|
||||
seltype => etc_t,
|
||||
seluser => system_u,
|
||||
}
|
||||
|
||||
# errors dir
|
||||
file { $hy_errors_dir:
|
||||
ensure => directory,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0755',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => etc_t,
|
||||
seluser => system_u,
|
||||
}
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
|
||||
@@ -155,7 +155,22 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
|
||||
59
|
||||
60
|
||||
61
|
||||
62</pre>
|
||||
62
|
||||
63
|
||||
64
|
||||
65
|
||||
66
|
||||
67
|
||||
68
|
||||
69
|
||||
70
|
||||
71
|
||||
72
|
||||
73
|
||||
74
|
||||
75
|
||||
76
|
||||
77</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 23</span>
|
||||
@@ -198,6 +213,21 @@ class cd_haproxy::main::files (
|
||||
seltype => haproxy_var_run_t,
|
||||
seluser => system_u,
|
||||
}
|
||||
|
||||
# error files
|
||||
file { $hy_400_file:
|
||||
ensure => file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => etc_t,
|
||||
seluser => system_u,
|
||||
content => template($hy_400_erb),
|
||||
notify => Service[$hy_service],
|
||||
}
|
||||
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
|
||||
@@ -810,7 +810,10 @@ succeed.</p>
|
||||
132
|
||||
133
|
||||
134
|
||||
135</pre>
|
||||
135
|
||||
136
|
||||
137
|
||||
138</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 74</span>
|
||||
@@ -867,10 +870,13 @@ $hy_service = 'haproxy'
|
||||
|
||||
# directories
|
||||
$hy_main_dir = '/etc/haproxy'
|
||||
$hy_errors_dir = "${hy_main_dir}/errors"
|
||||
|
||||
# files
|
||||
$hy_main_config = "${hy_main_dir}/haproxy.cfg"
|
||||
$hy_config_head_erb = 'cd_haproxy/haproxy_head.erb'
|
||||
$hy_400_file = "${hy_errors_dir}/400.http"
|
||||
$hy_400_erb = 'cd_haproxy/400_http.erb'
|
||||
|
||||
# includes must be last
|
||||
|
||||
|
||||
Reference in New Issue
Block a user