From 5009ae57d9173233380f4b279d5f767695c224e6 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 10 Apr 2018 12:56:10 +0200 Subject: [PATCH 1/2] added dev branch --- Gemfile | 3 ++- Jenkinsfile | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index f1c0ec8..628327e 100644 --- a/Gemfile +++ b/Gemfile @@ -11,6 +11,7 @@ gem 'puppet-strings' gem 'rake' gem 'semantic_puppet' gem 'rgen' +gem 'public_suffix', '<= 2.0.5' # rspec must be v2 for ruby 1.8.7 if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' @@ -18,5 +19,5 @@ if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' gem 'rake', '~> 10.0' else # rubocop requires ruby >= 1.9 - gem 'rubocop' + gem 'rubocop', '<= 0.50.0' end diff --git a/Jenkinsfile b/Jenkinsfile index e88dff1..f40a842 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { stage('pulling master before adding files') { steps { - sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) { + sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { sh '''git config user.name "Jenkins Server" git config user.email jenkins@confdroid.com git pull origin master @@ -24,10 +24,11 @@ pipeline { stage('puppet-lint tests') { steps { - sh '''find . -iname *.pp -exec puppet-lint \\ + sh '''find . -iname *.pp -exec /var/lib/jenkins/bin/puppet-lint \\ --no-class_inherits_from_params_class-check \\ --no-variable_scope-check \\ --no-80chars-check \\ + --no-140chars-check \\ --no-arrow_alignment-check \\ --no-autoloader_layout-check \\ --log-format "%{path}:%{line}:%{check}:%{KIND}:%{message}" {} \\;''' @@ -96,7 +97,7 @@ Changelog of Git Changelog. {{#commits}} -{{hash}} {{authorName}} {{commitTime}} +{{hash}} {{authorName}} {{commitTime}}

{{{messageTitle}}}

@@ -129,7 +130,7 @@ Changelog of Git Changelog. {{/hasIssue}} {{#commits}} -[https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/{{hash}} {{hash}}] {{authorName}} {{commitTime}} +[https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/{{hash}} {{hash}}] {{authorName}} {{commitTime}} \'\'\'{{{messageTitle}}}\'\'\' @@ -202,9 +203,11 @@ Changelog of Git Changelog. } } + + stage('recommit changes to repo') { steps { - sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) { + sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { sh '''git config user.name "Jenkins Server" git config user.email jenkins@confdroid.com echo `git add -A && git commit -am "recommit for updates in build $BUILD_NUMBER"` From 406a049bcef19c7cd51129a5094cb87d38c6d9a3 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Tue, 10 Apr 2018 12:56:53 +0200 Subject: [PATCH 2/2] recommit for updates in build 1 --- CHANGELOG.md | 148 +++++++++++------- REPOSTRUCTURE.md | 56 ------- doc/_index.html | 8 +- doc/css/style.css | 7 + doc/file.README.html | 6 +- doc/frames.html | 2 +- doc/index.html | 6 +- doc/puppet_classes/cd_apache.html | 6 +- .../cd_apache_3A_3Amain_3A_3Aconfig.html | 6 +- doc/puppet_classes/cd_apache_3A_3Aparams.html | 6 +- .../cd_apache_3A_3Aserver_3A_3Adirs.html | 6 +- .../cd_apache_3A_3Aserver_3A_3Afiles.html | 6 +- .../cd_apache_3A_3Aserver_3A_3Ainstall.html | 6 +- .../cd_apache_3A_3Aserver_3A_3Aservice.html | 6 +- .../cd_apache_3A_3Aserver_3A_3Auser.html | 6 +- doc/top-level-namespace.html | 6 +- tests/UTF_Files | 1 + 17 files changed, 123 insertions(+), 165 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1640d00..a148635 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,32 +8,62 @@ Changelog of Git Changelog.

No issue

-5556fd1ec6fdd8d Jenkins Server 2017-07-11 17:12:52 +692569d70082d85 Jenkins Server 2017-07-11 17:27:24 +

+

recommit for updates in build 20

+ +

+5556fd1ec6fdd8d Jenkins Server 2017-07-11 17:12:52

recommit for updates in build 17

-08da1c5e7004f15 Arne Teuke 2017-07-11 17:12:23 -

-

finalised this stage

- -

-c1963582f006a9d Jenkins Server 2017-07-11 17:08:47 +c1963582f006a9d Jenkins Server 2017-07-11 17:08:47

recommit for updates in build 16

-19a1a86f2a3907b Arne Teuke 2017-07-11 17:06:45 -

-

finalised this stage

- -

-f1988c6272ba4a6 Jenkins Server 2017-07-11 17:01:52 +f1988c6272ba4a6 Jenkins Server 2017-07-11 17:01:52

recommit for updates in build 14

-834532297866d17 Arne Teuke 2017-07-11 17:01:19 + +

v0.0.1.7

+

No issue

+ + +4296733d3e34a37 Arne Teuke 2017-07-11 17:26:50 +

+

more improved testing

+ +

+387ab193a95da9e Arne Teuke 2017-07-11 17:24:39 +

+

more improved testing

+ +

+ +

v0.0.1.6

+

No issue

+ + +eacdc6522bc654c Arne Teuke 2017-07-11 17:14:21 +

+

updated README

+ +

+08da1c5e7004f15 Arne Teuke 2017-07-11 17:12:23 +

+

finalised this stage

+ +

+19a1a86f2a3907b Arne Teuke 2017-07-11 17:06:45 +

+

finalised this stage

+ +

+834532297866d17 Arne Teuke 2017-07-11 17:01:19

added one more step

@@ -43,62 +73,62 @@ Changelog of Git Changelog.

No issue

-114dd0f0b58ec6a Arne Teuke 2017-07-11 16:57:22 +114dd0f0b58ec6a Arne Teuke 2017-07-11 16:57:22

removed stale FileList

-7ba28eca8e1bd88 Arne Teuke 2017-07-11 16:56:04 +7ba28eca8e1bd88 Arne Teuke 2017-07-11 16:56:04

updated README and version

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

recommit for updates in build 12

-c9a26ad0546881e Arne Teuke 2017-07-11 16:53:03 +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 +a1b2032baaaf745 Jenkins Server 2017-07-11 16:32:16

recommit for updates in build 11

-c380f8f9960fa1a Jenkins Server 2017-07-10 18:00:02 +c380f8f9960fa1a Jenkins Server 2017-07-10 18:00:02

recommit for updates in build 10

-ed5ca1113ea3170 Jenkins Server 2017-07-09 15:24:08 +ed5ca1113ea3170 Jenkins Server 2017-07-09 15:24:08

recommit for updates in build 9

-36dc5918e52df38 Jenkins Server 2017-07-07 16:41:30 +36dc5918e52df38 Jenkins Server 2017-07-07 16:41:30

recommit for updates in build 4

-3715b3a582a1a5a Arne Teuke 2017-07-07 16:40:31 +3715b3a582a1a5a Arne Teuke 2017-07-07 16:40:31

updated README

-871d6e65baf4ec4 Jenkins Server 2017-07-07 16:38:35 +871d6e65baf4ec4 Jenkins Server 2017-07-07 16:38:35

recommit for updates in build 3

-a88ed09f423fbb7 Arne Teuke 2017-07-07 16:38:00 +a88ed09f423fbb7 Arne Teuke 2017-07-07 16:38:00

updated README

-e13154f0117c337 Jenkins Server 2017-07-07 15:22:20 +e13154f0117c337 Jenkins Server 2017-07-07 15:22:20

recommit for updates in build 2

@@ -108,12 +138,12 @@ Changelog of Git Changelog.

No issue

-9b646162ae4c877 Arne Teuke 2017-07-11 16:31:45 +9b646162ae4c877 Arne Teuke 2017-07-11 16:31:45

added new Jenkins test to check for unwanted UTF8 files

-df0edc483d0918b Arne Teuke 2017-07-10 17:59:32 +df0edc483d0918b Arne Teuke 2017-07-10 17:59:32

converted LICENSE to ASCII

@@ -123,22 +153,22 @@ Changelog of Git Changelog.

No issue

-ed7589fbfab9f48 Arne Teuke 2017-07-09 15:23:38 +ed7589fbfab9f48 Arne Teuke 2017-07-09 15:23:38

removed sites and simply added the examples

-fefd3a57ab1309e Arne Teuke 2017-07-09 15:22:04 +fefd3a57ab1309e Arne Teuke 2017-07-09 15:22:04

removed sites and simply added the examples

-0768054b488d129 Arne Teuke 2017-07-09 15:20:05 +0768054b488d129 Arne Teuke 2017-07-09 15:20:05

added vhost examples

-7ac9b407305f98f Arne Teuke 2017-07-09 15:18:26 +7ac9b407305f98f Arne Teuke 2017-07-09 15:18:26

added vhost examples

@@ -148,12 +178,12 @@ Changelog of Git Changelog.

No issue

-ef4e41395b0e8af Arne Teuke 2017-07-09 15:15:32 +ef4e41395b0e8af Arne Teuke 2017-07-09 15:15:32

updated README with vhost details and updated version

-ce399480a464f9e Arne Teuke 2017-07-09 15:08:26 +ce399480a464f9e Arne Teuke 2017-07-09 15:08:26

updated README

@@ -163,27 +193,27 @@ Changelog of Git Changelog.

No issue

-898cbe17468d9f0 Arne Teuke 2017-07-07 15:21:28 +898cbe17468d9f0 Arne Teuke 2017-07-07 15:21:28

updated README

-ff758351baaf2af Jenkins Server 2017-07-07 15:18:31 +ff758351baaf2af Jenkins Server 2017-07-07 15:18:31

recommit for updates in build 1

-f434a67d79dd236 Arne Teuke 2017-07-07 15:17:42 +f434a67d79dd236 Arne Teuke 2017-07-07 15:17:42

updated README and version

-44a6e4aa082511c Arne Teuke 2017-07-07 15:15:43 +44a6e4aa082511c Arne Teuke 2017-07-07 15:15:43

added Puppet documentation, Jenkinsfile and Gemfile for CI

-08e4559e677e0e7 Arne Teuke 2017-06-20 10:25:53 +08e4559e677e0e7 Arne Teuke 2017-06-20 10:25:53

updated README

@@ -193,102 +223,102 @@ Changelog of Git Changelog.

No issue

-c223872b293c10a Arne Teuke 2017-06-20 09:24:58 +c223872b293c10a Arne Teuke 2017-06-20 09:24:58

finished initial release

-b2ad14d45611d8b Arne Teuke 2017-06-20 09:18:30 +b2ad14d45611d8b Arne Teuke 2017-06-20 09:18:30

added all file controls

-b0b9a0a692fba2d Arne Teuke 2017-06-19 16:06:52 +b0b9a0a692fba2d Arne Teuke 2017-06-19 16:06:52

started adding files

-9b09518580e22b4 Arne Teuke 2017-06-19 15:24:25 +9b09518580e22b4 Arne Teuke 2017-06-19 15:24:25

finished directories

-84fc5905c149f2b Arne Teuke 2017-06-19 15:18:29 +84fc5905c149f2b Arne Teuke 2017-06-19 15:18:29

changed user home

-fb976134a14040f Arne Teuke 2017-06-19 15:12:54 +fb976134a14040f Arne Teuke 2017-06-19 15:12:54

changed group

-c64c46b8962ea2c Arne Teuke 2017-06-19 15:10:56 +c64c46b8962ea2c Arne Teuke 2017-06-19 15:10:56

added more dirs

-21dbe645b54d37d Arne Teuke 2017-06-19 15:07:36 +21dbe645b54d37d Arne Teuke 2017-06-19 15:07:36

added more dirs

-e4d82e708ff6138 Arne Teuke 2017-06-19 15:00:02 +e4d82e708ff6138 Arne Teuke 2017-06-19 15:00:02

added more dirs

-bbcb22214b0543e Arne Teuke 2017-06-19 14:55:05 +bbcb22214b0543e Arne Teuke 2017-06-19 14:55:05

added more dirs

-1716f1654b94fda Arne Teuke 2017-06-19 14:47:05 +1716f1654b94fda Arne Teuke 2017-06-19 14:47:05

fixed target

-f544863d4dc69c5 Arne Teuke 2017-06-19 14:41:36 +f544863d4dc69c5 Arne Teuke 2017-06-19 14:41:36

added some directory control, testing

-7db89790839718b Arne Teuke 2017-06-19 14:40:58 +7db89790839718b Arne Teuke 2017-06-19 14:40:58

added some directory control, testing

-c5be228aa7a091f Arne Teuke 2017-06-19 14:38:44 +c5be228aa7a091f Arne Teuke 2017-06-19 14:38:44

added some directory control, testing

-a441326bf8ef9e1 Arne Teuke 2017-06-19 14:35:06 +a441326bf8ef9e1 Arne Teuke 2017-06-19 14:35:06

added some directory control, testing

-9f79e6b25b36463 Arne Teuke 2017-06-19 14:33:27 +9f79e6b25b36463 Arne Teuke 2017-06-19 14:33:27

added some directory control, testing

-83b33bf7f5eccbd Arne Teuke 2017-06-19 13:50:10 +83b33bf7f5eccbd Arne Teuke 2017-06-19 13:50:10

added user management

-67f81f9795d48ae Arne Teuke 2017-06-19 13:45:41 +67f81f9795d48ae Arne Teuke 2017-06-19 13:45:41

changed package selection

-972c9a059f08212 Arne Teuke 2017-06-19 13:42:52 +972c9a059f08212 Arne Teuke 2017-06-19 13:42:52

changed package selection

-1bd7fe8230f98cf Arne Teuke 2017-06-19 13:32:14 +1bd7fe8230f98cf Arne Teuke 2017-06-19 13:32:14

added service control

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index e18195c..8b13789 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -1,57 +1 @@ -. -|-- doc -| |-- css -| | |-- common.css -| | |-- full_list.css -| | `-- style.css -| |-- js -| | |-- app.js -| | |-- full_list.js -| | `-- jquery.js -| |-- puppet_classes -| | |-- cd_apache_3A_3Amain_3A_3Aconfig.html -| | |-- cd_apache_3A_3Aparams.html -| | |-- cd_apache_3A_3Aserver_3A_3Adirs.html -| | |-- cd_apache_3A_3Aserver_3A_3Afiles.html -| | |-- cd_apache_3A_3Aserver_3A_3Ainstall.html -| | |-- cd_apache_3A_3Aserver_3A_3Aservice.html -| | |-- cd_apache_3A_3Aserver_3A_3Auser.html -| | `-- cd_apache.html -| |-- file.README.html -| |-- frames.html -| |-- _index.html -| |-- index.html -| |-- puppet_class_list.html -| `-- top-level-namespace.html -|-- examples -| |-- vhost.erb -| `-- vhost_ssl.erb -|-- manifests -| |-- main -| | `-- config.pp -| |-- server -| | |-- dirs.pp -| | |-- files.pp -| | |-- install.pp -| | |-- service.pp -| | `-- user.pp -| |-- init.pp -| `-- params.pp -|-- templates -| |-- autoindex_conf.erb -| |-- httpd_conf.erb -| |-- magic.erb -| |-- ssl_conf.erb -| |-- userdir_conf.erb -| `-- welcome.conf -|-- tests -| `-- UTF_Files -|-- CHANGELOG.md -|-- Gemfile -|-- Gemfile.lock -|-- Jenkinsfile -|-- LICENSE -|-- README.md -`-- REPOSTRUCTURE.md -10 directories, 44 files diff --git a/doc/_index.html b/doc/_index.html index 4157de1..ec4fe69 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -4,7 +4,7 @@ - Documentation by YARD 0.9.9 + Documentation by YARD 0.9.12 @@ -52,7 +52,7 @@
-

Documentation by YARD 0.9.9

+

Documentation by YARD 0.9.12

Alphabetic Index

@@ -137,9 +137,7 @@
diff --git a/doc/css/style.css b/doc/css/style.css index f682a69..57e8f9d 100644 --- a/doc/css/style.css +++ b/doc/css/style.css @@ -484,6 +484,13 @@ pre.code .rubyid_backref, pre.code .rubyid_nth_ref { color: #6D79DE; } pre.code .regexp, .dregexp { color: #036A07; } pre.code a { border-bottom: 1px dotted #bbf; } +/* inline code */ +p > code { + padding: 1px 3px 1px 3px; + border: 1px solid #E1E1E8; + background: #F7F7F9; + border-radius: 4px; +} /* Color fix for links */ #content .summary_desc pre.code .id > .object_link a, /* identifier */ diff --git a/doc/file.README.html b/doc/file.README.html index 95d7256..88e5f05 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -6,7 +6,7 @@ File: README - — Documentation by YARD 0.9.9 + — Documentation by YARD 0.9.12 @@ -279,9 +279,7 @@ environments.

diff --git a/doc/frames.html b/doc/frames.html index 0cb1371..42ca6b6 100644 --- a/doc/frames.html +++ b/doc/frames.html @@ -2,7 +2,7 @@ - Documentation by YARD 0.9.9 + Documentation by YARD 0.9.12