From 7ba28eca8e1bd889d7e08b56cc7a1938c9c99ae9 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 11 Jul 2017 17:56:04 +0100 Subject: [PATCH 1/4] updated README and version --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7d3c807..fb6e744 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_apache`| 0.0.1.3 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache)](https://jenkins.confdroid.com/job/cd_apache/)| +|`cd_apache`| 0.0.1.4 | [![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,7 +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 +* Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files) ### Contact Us [contact Us](https://confdroid.com/contact/) From 114dd0f0b58ec6ae5ddc745dc6b1e30ae284f4b3 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 11 Jul 2017 17:57:22 +0100 Subject: [PATCH 2/4] removed stale FileList --- FileList | 82 -------------------------------------------------------- 1 file changed, 82 deletions(-) delete mode 100644 FileList diff --git a/FileList b/FileList deleted file mode 100644 index 2d17f87..0000000 --- a/FileList +++ /dev/null @@ -1,82 +0,0 @@ -./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, 44 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/89/ffb153dc556486a6e605f1742adf91bca4e70d: VAX COFF executable not stripped - version 20753 -./.git/objects/pack/pack-48ea62c13417ef03711351f8e923aa73c97bad79.pack: Git pack, version 2, 362 objects -./.git/objects/pack/pack-48ea62c13417ef03711351f8e923aa73c97bad79.idx: Git pack index, version 2 -./.git/objects/f7/3b03df8966d3bf58e71a18715f9b39cd998d68: VAX COFF executable not stripped - version 19657 -./.git/refs/tags/v0.0.1.3: ASCII text -./.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 -./FileList: 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 From 834532297866d173967e113a85617c81a84199db Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 11 Jul 2017 18:01:19 +0100 Subject: [PATCH 3/4] added one more step --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a2bddc6..dbbc88f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -183,9 +183,9 @@ Changelog of Git Changelog. stage('check for UTF-8 files') { steps { - sh '''echo "$(find . -type f -exec file {} \\;)" > FileList - mkdir tests - echo "$(grep -v ASCII FileList | grep -v git)" > tests/UTF_Files''' + sh '''rm -Rf tests/UTF_Files + echo "$(find . -type f -exec file {} \\;)" > FileList + echo "$(grep -v ASCII FileList | grep -v git)" > tests/UTF_Files''' } } From f1988c6272ba4a6bde1a3d277d4000be1e52e99f Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 11 Jul 2017 19:01:52 +0200 Subject: [PATCH 4/4] recommit for updates in build 14 --- CHANGELOG.md | 10 ++++++++++ REPOSTRUCTURE.md | 5 +++-- doc/_index.html | 2 +- doc/file.README.html | 6 +++--- doc/index.html | 6 +++--- doc/puppet_classes/cd_apache.html | 2 +- .../cd_apache_3A_3Amain_3A_3Aconfig.html | 2 +- doc/puppet_classes/cd_apache_3A_3Aparams.html | 2 +- .../cd_apache_3A_3Aserver_3A_3Adirs.html | 2 +- .../cd_apache_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_apache_3A_3Aserver_3A_3Ainstall.html | 2 +- .../cd_apache_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_apache_3A_3Aserver_3A_3Auser.html | 2 +- doc/top-level-namespace.html | 2 +- 14 files changed, 29 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5e47ec..50a911b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+3764f0bef1450d2 Jenkins Server 2017-07-11 16:53:37 +

+

recommit for updates in build 12

+ +

+c9a26ad0546881e Arne Teuke 2017-07-11 16:53:03 +

+

enhanced test to keep a permanent list of UTF files in tests/UTF_Files

+ +

a1b2032baaaf745 Jenkins Server 2017-07-11 16:32:16

recommit for updates in build 11

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 76f4707..9155ff6 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -44,12 +44,13 @@ | |-- ssl_conf.erb | |-- userdir_conf.erb | `-- welcome.conf +|-- tests +| `-- UTF_Files |-- CHANGELOG.md -|-- FileList |-- Gemfile |-- Gemfile.lock |-- Jenkinsfile |-- LICENSE `-- README.md -9 directories, 43 files +10 directories, 43 files diff --git a/doc/_index.html b/doc/_index.html index 1a0d2ec..9393545 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -137,7 +137,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 3d53d1a..6717cc4 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -61,7 +61,7 @@

|Repo Name| version | Build Status| |---|---|---|---| -|cd_apache| 0.0.1.3 | cd_apache| 0.0.1.4 | {Build Status/]|

@@ -260,7 +260,7 @@ block, not per class.

  • ERB Template Parser

  • -

    Test for unwanted UTF8 files in the Puppet code

    +

    Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files)

    • Contact Us

    @@ -279,7 +279,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index e0316fc..364c9b6 100644 --- a/doc/index.html +++ b/doc/index.html @@ -61,7 +61,7 @@

    |Repo Name| version | Build Status| |---|---|---|---| -|cd_apache| 0.0.1.3 | cd_apache| 0.0.1.4 | {Build Status/]|

    @@ -260,7 +260,7 @@ block, not per class.

  • ERB Template Parser

  • -

    Test for unwanted UTF8 files in the Puppet code

    +

    Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files)

    • Contact Us

    @@ -279,7 +279,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_apache.html b/doc/puppet_classes/cd_apache.html index 578de39..a921fd8 100644 --- a/doc/puppet_classes/cd_apache.html +++ b/doc/puppet_classes/cd_apache.html @@ -140,7 +140,7 @@ class cd_apache { diff --git a/doc/puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html index 9637f8a..37535c8 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_apache_3A_3Aparams.html b/doc/puppet_classes/cd_apache_3A_3Aparams.html index 961869d..f1d85fb 100644 --- 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 = 'cd_apache/userdir_conf.erb' diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html index 4899cda..4a6174c 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html index f510968..eacf04b 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html index 2969bfa..bcbcc55 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html index baa9a6e..b9c2388 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html index 5fffe8f..fb829ca 100644 --- 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 ( diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index 4ca6e6a..72798f9 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@