recommit for updates in build 8

This commit is contained in:
2018-04-20 11:41:16 +02:00
parent 646f3292b7
commit 58e6948571
3 changed files with 64 additions and 48 deletions

View File

@@ -8,6 +8,21 @@ Changelog of Git Changelog.
<h2> No issue </h2>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/a23a3bc4c150283">a23a3bc4c150283</a> Jenkins ConfDroid <i>2018-04-20 09:36:16</i>
<p>
<h3>recommit for updates in build 7</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/5977dab8c8432e5">5977dab8c8432e5</a> Arne Teuke <i>2018-04-20 09:36:10</i>
<p>
<h3>fixes typo</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/dddb9afc18a15d6">dddb9afc18a15d6</a> Arne Teuke <i>2018-04-20 09:30:48</i>
<p>
<h3>adds fw rules here to ensure fw is managed on apache lavel instead application level</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/3e4c6a15e5f8440">3e4c6a15e5f8440</a> Jenkins ConfDroid <i>2018-04-20 08:32:51</i>
<p>
<h3>recommit for updates in build 5</h3>
@@ -72,11 +87,21 @@ Changelog of Git Changelog.
<p>
<h3>recommit for updates in build 17</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/08da1c5e7004f15">08da1c5e7004f15</a> Arne Teuke <i>2017-07-11 17:12:23</i>
<p>
<h3>finalised this stage</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/c1963582f006a9d">c1963582f006a9d</a> Jenkins Server <i>2017-07-11 17:08:47</i>
<p>
<h3>recommit for updates in build 16</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/19a1a86f2a3907b">19a1a86f2a3907b</a> Arne Teuke <i>2017-07-11 17:06:45</i>
<p>
<h3>finalised this stage</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/f1988c6272ba4a6">f1988c6272ba4a6</a> Jenkins Server <i>2017-07-11 17:01:52</i>
<p>
@@ -137,6 +162,26 @@ Changelog of Git Changelog.
<p>
<h3>recommit for updates in build 2</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/ff758351baaf2af">ff758351baaf2af</a> Jenkins Server <i>2017-07-07 15:18:31</i>
<p>
<h3>recommit for updates in build 1</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/f434a67d79dd236">f434a67d79dd236</a> Arne Teuke <i>2017-07-07 15:17:42</i>
<p>
<h3>updated README and version</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/44a6e4aa082511c">44a6e4aa082511c</a> Arne Teuke <i>2017-07-07 15:15:43</i>
<p>
<h3>added Puppet documentation, Jenkinsfile and Gemfile for CI</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/08e4559e677e0e7">08e4559e677e0e7</a> Arne Teuke <i>2017-06-20 10:25:53</i>
<p>
<h3>updated README</h3>
</p>
<h2> v0.0.1.7 </h2>
@@ -162,16 +207,6 @@ Changelog of Git Changelog.
<p>
<h3>updated README</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/08da1c5e7004f15">08da1c5e7004f15</a> Arne Teuke <i>2017-07-11 17:12:23</i>
<p>
<h3>finalised this stage</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/19a1a86f2a3907b">19a1a86f2a3907b</a> Arne Teuke <i>2017-07-11 17:06:45</i>
<p>
<h3>finalised this stage</h3>
</p>
<h2> v0.0.1.4 </h2>
@@ -252,26 +287,6 @@ Changelog of Git Changelog.
<p>
<h3>updated README</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/ff758351baaf2af">ff758351baaf2af</a> Jenkins Server <i>2017-07-07 15:18:31</i>
<p>
<h3>recommit for updates in build 1</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/f434a67d79dd236">f434a67d79dd236</a> Arne Teuke <i>2017-07-07 15:17:42</i>
<p>
<h3>updated README and version</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/44a6e4aa082511c">44a6e4aa082511c</a> Arne Teuke <i>2017-07-07 15:15:43</i>
<p>
<h3>added Puppet documentation, Jenkinsfile and Gemfile for CI</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/08e4559e677e0e7">08e4559e677e0e7</a> Arne Teuke <i>2017-06-20 10:25:53</i>
<p>
<h3>updated README</h3>
</p>
<h2> v0.0.0.2 </h2>

View File

@@ -9,6 +9,7 @@
| | |-- full_list.js
| | `-- jquery.js
| |-- puppet_classes
| | |-- cd_apache_3A_3Afirewall_3A_3Aiptables.html
| | |-- cd_apache_3A_3Amain_3A_3Aconfig.html
| | |-- cd_apache_3A_3Amonitoring_3A_3Atarget.html
| | |-- cd_apache_3A_3Aparams.html
@@ -60,4 +61,4 @@
|-- README.md
`-- REPOSTRUCTURE.md
12 directories, 48 files
12 directories, 49 files

View File

@@ -313,23 +313,6 @@ class cd_apache::server::files (
notify =&gt; Service[&#39;httpd&#39;],
}
# manage index.html
file { $ae_index_file:
ensure =&gt; file,
path =&gt; $ae_index_file,
owner =&gt; $ae_user_name,
group =&gt; $ae_user_name,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; httpd_sys_content_t,
seluser =&gt; system_u,
content =&gt; template($ae_index_erb),
notify =&gt; Service[&#39;httpd&#39;],
}
if $ae_allow_user_dirs == true {
# manage userdir.conf
@@ -349,6 +332,23 @@ class cd_apache::server::files (
}
}
}
# manage index.html
file { $ae_index_file:
ensure =&gt; file,
path =&gt; $ae_index_file,
owner =&gt; $ae_user_name,
group =&gt; $ae_user_name,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; httpd_sys_content_t,
seluser =&gt; system_u,
content =&gt; template($ae_index_erb),
notify =&gt; Service[&#39;httpd&#39;],
}
}</pre>
</td>
</tr>