recommit for updates in build 42

This commit is contained in:
Jenkins ConfDroid
2018-12-30 17:51:20 +01:00
parent 138c2bac0e
commit 6b257cb39a
5 changed files with 82 additions and 4 deletions

View File

@@ -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 =&gt; etc_t,
seluser =&gt; system_u,
}
# errors dir
file { $hy_errors_dir:
ensure =&gt; directory,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0755&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
}
}
}</pre>
</td>

View File

@@ -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 =&gt; haproxy_var_run_t,
seluser =&gt; system_u,
}
# error files
file { $hy_400_file:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_400_erb),
notify =&gt; Service[$hy_service],
}
}
}</pre>
</td>

View File

@@ -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 = &#39;haproxy&#39;
# directories
$hy_main_dir = &#39;/etc/haproxy&#39;
$hy_errors_dir = &quot;${hy_main_dir}/errors&quot;
# files
$hy_main_config = &quot;${hy_main_dir}/haproxy.cfg&quot;
$hy_config_head_erb = &#39;cd_haproxy/haproxy_head.erb&#39;
$hy_400_file = &quot;${hy_errors_dir}/400.http&quot;
$hy_400_erb = &#39;cd_haproxy/400_http.erb&#39;
# includes must be last