recommit for updates in build 5

2018-04-20 10:32:51 +02:00
parent daa771bb0a
commit 3e4c6a15e5
5 changed files with 117 additions and 61 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,29 +8,44 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/0ea5a3a76907b09">0ea5a3a76907b09</a> Jenkins ConfDroid <i>2018-04-20 08:06:28</i>
+<p>
+<h3>recommit for updates in build 4</h3>
+
+</p>
 <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/921eeddd761dc4c">921eeddd761dc4c</a> Jenkins ConfDroid <i>2018-04-10 11:21:33</i>
 <p>
 <h3>recommit for updates in build 3</h3>

-</p>
-<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/1118729c9640ecb">1118729c9640ecb</a> Arne Teuke <i>2018-04-10 11:20:56</i>
-<p>
-<h3>updates README</h3>
-
 </p>
 <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/62260e329bcf99e">62260e329bcf99e</a> Jenkins ConfDroid <i>2018-04-10 11:06:02</i>
 <p>
 <h3>recommit for updates in build 2</h3>

 </p>
-<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/84ca8d72b971661">84ca8d72b971661</a> Arne Teuke <i>2018-04-10 11:05:24</i>
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/406a049bcef19c7">406a049bcef19c7</a> Jenkins ConfDroid <i>2018-04-10 10:56:53</i>
+<p>
+<h3>recommit for updates in build 1</h3>
+
+</p>
+
+<h2> 0.0.1.8 </h2>
+<h2> No issue </h2>
+
+
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/e68298bc5c126fc">e68298bc5c126fc</a> Arne Teuke <i>2018-04-20 08:06:12</i>
+<p>
+<h3>adds nagios target</h3>
+
+</p>
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/1118729c9640ecb">1118729c9640ecb</a> Arne Teuke <i>2018-04-10 11:20:56</i>
 <p>
 <h3>updates README</h3>

 </p>
-<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/406a049bcef19c7">406a049bcef19c7</a> Jenkins ConfDroid <i>2018-04-10 10:56:53</i>
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/84ca8d72b971661">84ca8d72b971661</a> Arne Teuke <i>2018-04-10 11:05:24</i>
 <p>
-<h3>recommit for updates in build 1</h3>
+<h3>updates README</h3>

 </p>
 <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/5009ae57d917323">5009ae57d917323</a> Arne Teuke <i>2018-04-10 10:56:10</i>
@@ -57,61 +72,11 @@ Changelog of Git Changelog.
 <p>
 <h3>recommit for updates in build 14</h3>

-</p>
-
-<h2> v0.0.1.7 </h2>
-<h2> No issue </h2>
-
-
-<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/4296733d3e34a37">4296733d3e34a37</a> Arne Teuke <i>2017-07-11 17:26:50</i>
-<p>
-<h3>more improved testing</h3>
-
-</p>
-<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/387ab193a95da9e">387ab193a95da9e</a> Arne Teuke <i>2017-07-11 17:24:39</i>
-<p>
-<h3>more improved testing</h3>
-
-</p>
-
-<h2> v0.0.1.6 </h2>
-<h2> No issue </h2>
-
-
-<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/eacdc6522bc654c">eacdc6522bc654c</a> Arne Teuke <i>2017-07-11 17:14:21</i>
-<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>
 <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/834532297866d17">834532297866d17</a> Arne Teuke <i>2017-07-11 17:01:19</i>
 <p>
 <h3>added one more step</h3>

-</p>
-
-<h2> v0.0.1.4 </h2>
-<h2> No issue </h2>
-
-
-<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/114dd0f0b58ec6a">114dd0f0b58ec6a</a> Arne Teuke <i>2017-07-11 16:57:22</i>
-<p>
-<h3>removed stale FileList</h3>
-
-</p>
-<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/7ba28eca8e1bd88">7ba28eca8e1bd88</a> Arne Teuke <i>2017-07-11 16:56:04</i>
-<p>
-<h3>updated README and version</h3>
-
 </p>
 <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/3764f0bef1450d2">3764f0bef1450d2</a> Jenkins Server <i>2017-07-11 16:53:37</i>
 <p>
@@ -164,6 +129,56 @@ Changelog of Git Changelog.

 </p>

+<h2> v0.0.1.7 </h2>
+<h2> No issue </h2>
+
+
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/4296733d3e34a37">4296733d3e34a37</a> Arne Teuke <i>2017-07-11 17:26:50</i>
+<p>
+<h3>more improved testing</h3>
+
+</p>
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/387ab193a95da9e">387ab193a95da9e</a> Arne Teuke <i>2017-07-11 17:24:39</i>
+<p>
+<h3>more improved testing</h3>
+
+</p>
+
+<h2> v0.0.1.6 </h2>
+<h2> No issue </h2>
+
+
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/eacdc6522bc654c">eacdc6522bc654c</a> Arne Teuke <i>2017-07-11 17:14:21</i>
+<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>
+<h2> No issue </h2>
+
+
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/114dd0f0b58ec6a">114dd0f0b58ec6a</a> Arne Teuke <i>2017-07-11 16:57:22</i>
+<p>
+<h3>removed stale FileList</h3>
+
+</p>
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/7ba28eca8e1bd88">7ba28eca8e1bd88</a> Arne Teuke <i>2017-07-11 16:56:04</i>
+<p>
+<h3>updated README and version</h3>
+
+</p>
+
 <h2> v0.0.1.3 </h2>
 <h2> No issue </h2>

--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -10,6 +10,7 @@
 |   |   `-- jquery.js
 |   |-- puppet_classes
 |   |   |-- cd_apache_3A_3Amain_3A_3Aconfig.html
+|   |   |-- cd_apache_3A_3Amonitoring_3A_3Atarget.html
 |   |   |-- cd_apache_3A_3Aparams.html
 |   |   |-- cd_apache_3A_3Aserver_3A_3Adirs.html
 |   |   |-- cd_apache_3A_3Aserver_3A_3Afiles.html
@@ -42,6 +43,7 @@
 |-- templates
 |   |-- autoindex_conf.erb
 |   |-- httpd_conf.erb
+|   |-- index_html.erb
 |   |-- magic.erb
 |   |-- ssl_conf.erb
 |   |-- userdir_conf.erb
@@ -56,4 +58,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md

-11 directories, 45 files
+11 directories, 47 files
--- a/doc/puppet_classes/cd_apache_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aparams.html
@@ -488,7 +488,9 @@ disabled.</p>
 121
 122
 123
-124</pre>
+124
+125
+126</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 59</span>
@@ -553,6 +555,8 @@ $ae_autoindex_file  = &quot;${ae_conf_d_dir}/autoindex.conf&quot;
 $ae_autoindex_erb   = &#39;cd_apache/autoindex_conf.erb&#39;
 $ae_userdir_file    = &quot;${ae_conf_d_dir}/userdir.conf&quot;
 $ae_userdir_erb     = &#39;cd_apache/userdir_conf.erb&#39;
+$ae_index_file      = &#39;/var/www/html/index.html&#39;
+$ae_index_erb       = &#39;cd_apache/index_html.erb&#39;

 # includes must be last

--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
@@ -219,7 +219,24 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 112
 113
 114
-115</pre>
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 24</span>
@@ -296,6 +313,23 @@ 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
--- a/tests/UTF_Files
+++ b/tests/UTF_Files
@@ -2,5 +2,6 @@
 ./.yardoc/proxy_types: Applesoft BASIC program data
 ./.yardoc/complete: empty
 ./.yardoc/objects/root.dat: data
+./templates/index_html.erb: empty
 ./doc/css/style.css: HTML document, UTF-8 Unicode text, with very long lines
 ./doc/js/jquery.js: HTML document, UTF-8 Unicode text, with very long lines