Merge branch 'jenkins' into 'master'

Jenkins See merge request !9
2017-07-11 18:25:32 +02:00
parent 38f4b62ff6 a1b2032baa
commit 6ae6ad8f57
16 changed files with 117 additions and 15 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/c380f8f9960fa1a">c380f8f9960fa1a</a> Jenkins Server <i>2017-07-10 18:00:02</i>
+<p>
+<h3>recommit for updates in build 10</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/df0edc483d0918b">df0edc483d0918b</a> Arne Teuke <i>2017-07-10 17:59:32</i>
+<p>
+<h3>converted LICENSE to ASCII</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/ed5ca1113ea3170">ed5ca1113ea3170</a> Jenkins Server <i>2017-07-09 15:24:08</i>
 <p>
 <h3>recommit for updates in build 9</h3>
--- a/80
+++ b/80
@@ -0,0 +1,80 @@
+./CHANGELOG.md: HTML document, ASCII text
+./README.md: ASCII text, with very long lines
+./REPOSTRUCTURE.md: ASCII text
+./examples/vhost.erb: ASCII text
+./examples/vhost_ssl.erb: ASCII text
+./Jenkinsfile: Python script, ASCII text executable, with very long lines
+./.gitignore: ASCII text
+./LICENSE: ASCII text, with very long lines
+./Gemfile.lock: ASCII text
+./.yardoc/checksums: ASCII text
+./.yardoc/object_types: data
+./.yardoc/proxy_types: Applesoft BASIC program data
+./.yardoc/complete: empty
+./.yardoc/objects/root.dat: data
+./doc/css/style.css: HTML document, UTF-8 Unicode text, with very long lines
+./doc/css/common.css: ASCII text
+./doc/css/full_list.css: ASCII text, with very long lines
+./doc/index.html: C++ source, ASCII text
+./doc/top-level-namespace.html: HTML document, ASCII text
+./doc/js/full_list.js: ASCII text
+./doc/js/app.js: HTML document, ASCII text
+./doc/js/jquery.js: HTML document, UTF-8 Unicode text, with very long lines
+./doc/puppet_class_list.html: HTML document, ASCII text
+./doc/puppet_classes/cd_apache.html: C++ source, ASCII text
+./doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html: C++ source, ASCII text
+./doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html: C++ source, ASCII text
+./doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html: C++ source, ASCII text
+./doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html: C++ source, ASCII text
+./doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html: C++ source, ASCII text
+./doc/puppet_classes/cd_apache_3A_3Aparams.html: HTML document, ASCII text
+./doc/puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html: C++ source, ASCII text
+./doc/frames.html: HTML document, ASCII text
+./doc/file.README.html: C++ source, ASCII text
+./doc/_index.html: HTML document, ASCII text
+./Gemfile: ASCII text
+./templates/httpd_conf.erb: ASCII text
+./templates/autoindex_conf.erb: ASCII text
+./templates/magic.erb: ASCII text
+./templates/userdir_conf.erb: ASCII text
+./templates/welcome.conf: ASCII text
+./templates/ssl_conf.erb: ASCII text
+./.git/FETCH_HEAD: ASCII text
+./.git/index: Git index, version 2, 43 entries
+./.git/logs/refs/remotes/origin/development: ASCII text
+./.git/logs/refs/remotes/origin/master: ASCII text
+./.git/logs/refs/heads/jenkins: ASCII text
+./.git/logs/HEAD: ASCII text
+./.git/hooks/applypatch-msg.sample: POSIX shell script, ASCII text executable
+./.git/hooks/pre-applypatch.sample: POSIX shell script, ASCII text executable
+./.git/hooks/pre-push.sample: POSIX shell script, ASCII text executable
+./.git/hooks/pre-commit.sample: POSIX shell script, ASCII text executable
+./.git/hooks/update.sample: POSIX shell script, ASCII text executable
+./.git/hooks/pre-rebase.sample: POSIX shell script, ASCII text executable
+./.git/hooks/post-update.sample: POSIX shell script, ASCII text executable
+./.git/hooks/prepare-commit-msg.sample: POSIX shell script, ASCII text executable
+./.git/hooks/commit-msg.sample: POSIX shell script, ASCII text executable
+./.git/ORIG_HEAD: ASCII text
+./.git/description: ASCII text
+./.git/info/exclude: ASCII text
+./.git/objects/55/d6ef671b094da9289f341f9875f37117f30d42: VAX COFF executable not stripped - version 19657
+./.git/objects/pack/pack-399f76618aff75f69b65613e78d7b29e36b7ceb7.idx: Git pack index, version 2
+./.git/objects/pack/pack-399f76618aff75f69b65613e78d7b29e36b7ceb7.pack: Git pack, version 2, 336 objects
+./.git/objects/72/70cd3704c6a768ba09411a771457fd318f18cc: VAX COFF executable not stripped - version 1297
+./.git/refs/tags/v0.0.1.0: ASCII text
+./.git/refs/tags/v0.0.1.2: ASCII text
+./.git/refs/tags/v0.0.1.1: ASCII text
+./.git/refs/tags/v0.0.0.2: ASCII text
+./.git/refs/remotes/origin/development: ASCII text
+./.git/refs/remotes/origin/master: ASCII text
+./.git/refs/heads/jenkins: ASCII text
+./.git/config: ASCII text
+./.git/HEAD: ASCII text
+./manifests/params.pp: C++ source, ASCII text
+./manifests/server/install.pp: C++ source, ASCII text
+./manifests/server/service.pp: C++ source, ASCII text
+./manifests/server/user.pp: C++ source, ASCII text
+./manifests/server/dirs.pp: C++ source, ASCII text
+./manifests/server/files.pp: C++ source, ASCII text
+./manifests/init.pp: C++ source, ASCII text
+./manifests/main/config.pp: C++ source, ASCII text
--- a/7
+++ b/7
@@ -181,6 +181,13 @@ Changelog of Git Changelog.
        }
      }

+      stage('check for UTF-8 files') {
+        steps {
+          sh '''echo "$(find . -type f -exec file {} \\;)" > FileList
+            grep -v ASCII FileList | grep -v git'''
+        }
+      }
+
      stage('show diff') {
        steps {
          sh 'git diff'
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 |Repo Name| version | Build Status|
 |---|---|---|---|
-|`cd_apache`| 0.0.1.2 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache)](https://jenkins.confdroid.com/job/cd_apache/)|
+|`cd_apache`| 0.0.1.3 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache)](https://jenkins.confdroid.com/job/cd_apache/)|

 ### Synopsis
 `Apache httpd` is a very powerful and widely used web server.
@@ -110,6 +110,7 @@ All files and directories are configured with correct selinux context. If selinu
    * `--no-arrow_alignment-check`: this check leads to actually not having am easily readable arrow alignment, as this checks `per block`, not per class.
 * Puppet Parser
 * ERB Template Parser
+* Test for unwanted UTF8 files in the Puppet code

 ### Contact Us
 [contact Us](https://confdroid.com/contact/)
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -137,7 +137,7 @@
 </div>

      <div id="footer">
-  Generated on Mon Jul 10 20:00:00 2017 by
+  Generated on Tue Jul 11 18:32:12 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -61,7 +61,7 @@
 <p>|Repo Name| version | Build
 Status|
 |---|---|---|---|
-|<code>cd_apache</code>| 0.0.1.2 | <a
+|<code>cd_apache</code>| 0.0.1.3 | <a
 href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache">{Build
 Status</a>/]|</p>

@@ -259,6 +259,8 @@ block</code>, not per class.</p>
 <p>Puppet Parser</p>
 </li><li>
 <p>ERB Template Parser</p>
+</li><li>
+<p>Test for unwanted UTF8 files in the Puppet code</p>
 </li></ul>

 <h3 id="label-Contact+Us">Contact Us</h3>
@@ -277,7 +279,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Mon Jul 10 20:00:00 2017 by
+  Generated on Tue Jul 11 18:32:13 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/index.html
+++ b/doc/index.html
@@ -61,7 +61,7 @@
 <p>|Repo Name| version | Build
 Status|
 |---|---|---|---|
-|<code>cd_apache</code>| 0.0.1.2 | <a
+|<code>cd_apache</code>| 0.0.1.3 | <a
 href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache">{Build
 Status</a>/]|</p>

@@ -259,6 +259,8 @@ block</code>, not per class.</p>
 <p>Puppet Parser</p>
 </li><li>
 <p>ERB Template Parser</p>
+</li><li>
+<p>Test for unwanted UTF8 files in the Puppet code</p>
 </li></ul>

 <h3 id="label-Contact+Us">Contact Us</h3>
@@ -277,7 +279,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Mon Jul 10 20:00:00 2017 by
+  Generated on Tue Jul 11 18:32:13 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache.html
+++ b/doc/puppet_classes/cd_apache.html
@@ -140,7 +140,7 @@ class cd_apache {
 </div>

      <div id="footer">
-  Generated on Mon Jul 10 20:00:01 2017 by
+  Generated on Tue Jul 11 18:32:14 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html
@@ -153,7 +153,7 @@ class cd_apache::main::config (
 </div>

      <div id="footer">
-  Generated on Mon Jul 10 20:00:01 2017 by
+  Generated on Tue Jul 11 18:32:14 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aparams.html
@@ -525,7 +525,7 @@ $ae_userdir_erb     = &#39;cd_apache/userdir_conf.erb&#39;
 </div>

      <div id="footer">
-  Generated on Mon Jul 10 20:00:01 2017 by
+  Generated on Tue Jul 11 18:32:14 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html
@@ -528,7 +528,7 @@ class cd_apache::server::dirs (
 </div>

      <div id="footer">
-  Generated on Mon Jul 10 20:00:01 2017 by
+  Generated on Tue Jul 11 18:32:14 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
@@ -323,7 +323,7 @@ class cd_apache::server::files (
 </div>

      <div id="footer">
-  Generated on Mon Jul 10 20:00:01 2017 by
+  Generated on Tue Jul 11 18:32:14 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html
@@ -159,7 +159,7 @@ class cd_apache::server::install (
 </div>

      <div id="footer">
-  Generated on Mon Jul 10 20:00:01 2017 by
+  Generated on Tue Jul 11 18:32:14 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html
@@ -165,7 +165,7 @@ class cd_apache::server::service (
 </div>

      <div id="footer">
-  Generated on Mon Jul 10 20:00:01 2017 by
+  Generated on Tue Jul 11 18:32:14 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html
@@ -209,7 +209,7 @@ class cd_apache::server::user (
 </div>

      <div id="footer">
-  Generated on Mon Jul 10 20:00:01 2017 by
+  Generated on Tue Jul 11 18:32:14 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </div>

      <div id="footer">
-  Generated on Mon Jul 10 20:00:00 2017 by
+  Generated on Tue Jul 11 18:32:13 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>