From ed5ca1113ea3170d3c16bfcfe5ffc5945148f3af Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 9 Jul 2017 17:24:08 +0200 Subject: [PATCH 1/2] recommit for updates in build 9 --- CHANGELOG.md | 10 +++++ REPOSTRUCTURE.md | 5 ++- doc/_index.html | 2 +- doc/file.README.html | 38 ++++++++++++++++--- doc/index.html | 38 ++++++++++++++++--- 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, 88 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d3a90c..ece9a1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

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

+

recommit for updates in build 4

+ +

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

+

updated README

+ +

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

recommit for updates in build 3

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 995c7da..dfe3469 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -23,6 +23,9 @@ | |-- index.html | |-- puppet_class_list.html | `-- top-level-namespace.html +|-- examples +| |-- vhost.erb +| `-- vhost_ssl.erb |-- manifests | |-- main | | `-- config.pp @@ -47,4 +50,4 @@ |-- Jenkinsfile `-- README.md -8 directories, 39 files +9 directories, 41 files diff --git a/doc/_index.html b/doc/_index.html index 2ac1c0e..e203efc 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 9ab0288..2cab477 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.0 | cd_apache| 0.0.1.2 | {Build Status/]|

@@ -70,10 +70,9 @@ Status/]|

Apache httpd is a very powerful and widely used web server.

cd_apache automates the installation and configuration of -httpd. This module is a base module providing the httpd service itself, -meaning that it is designed to be used by other role- or profile modules, -adding more detailed configurations specific to the particular use case, -i.e. full content servers, front-end for application servers, proxies etc.

+httpd. This module is a base module simply providing the httpd service +itself to be used by other role- or profile modules, adding more detailed +configurations specific to the particular use case.

WARNING

@@ -139,6 +138,33 @@ system permissions

Maintenance * manage the service

+

vHosts

+ +

As stated in the ynopsis, this module was written particularly for usage as +base module. Apache httpd has a great number of usae cases +where it actually is not used directly as full blown webser, but instead as +'sub-service'. Examples here would be

+ + +

With those use cases, you would provide the vHosts at the Puppet module for +the application, not the base module. Also, if you plan to use this module +to run a plain fully fledged web server, you would use a role- or profile +class/module on top of cd_apache to set up your vHost exactly +as needed. Examples for regular basic vHost configuration files are +included in the examples directory as parameterized .erb files. You would +create a define for vhosts, i.e. using the example parameters, and simply +add cd_apache as requirement (i.e. require cd_apache) so it +gets installed automatically.

+

Repo Structure

Repostructure as been moved to REPOSTRUCTURE.md

@@ -251,7 +277,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 850257d..a1878d0 100644 --- a/doc/index.html +++ b/doc/index.html @@ -61,7 +61,7 @@

|Repo Name| version | Build Status| |---|---|---|---| -|cd_apache| 0.0.1.0 | cd_apache| 0.0.1.2 | {Build Status/]|

@@ -70,10 +70,9 @@ Status/]|

Apache httpd is a very powerful and widely used web server.

cd_apache automates the installation and configuration of -httpd. This module is a base module providing the httpd service itself, -meaning that it is designed to be used by other role- or profile modules, -adding more detailed configurations specific to the particular use case, -i.e. full content servers, front-end for application servers, proxies etc.

+httpd. This module is a base module simply providing the httpd service +itself to be used by other role- or profile modules, adding more detailed +configurations specific to the particular use case.

WARNING

@@ -139,6 +138,33 @@ system permissions

Maintenance * manage the service

+

vHosts

+ +

As stated in the ynopsis, this module was written particularly for usage as +base module. Apache httpd has a great number of usae cases +where it actually is not used directly as full blown webser, but instead as +'sub-service'. Examples here would be

+ + +

With those use cases, you would provide the vHosts at the Puppet module for +the application, not the base module. Also, if you plan to use this module +to run a plain fully fledged web server, you would use a role- or profile +class/module on top of cd_apache to set up your vHost exactly +as needed. Examples for regular basic vHost configuration files are +included in the examples directory as parameterized .erb files. You would +create a define for vhosts, i.e. using the example parameters, and simply +add cd_apache as requirement (i.e. require cd_apache) so it +gets installed automatically.

+

Repo Structure

Repostructure as been moved to REPOSTRUCTURE.md

@@ -251,7 +277,7 @@ environments.

diff --git a/doc/puppet_classes/cd_apache.html b/doc/puppet_classes/cd_apache.html index 3dda502..d2c1329 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 b4077c0..bbef899 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 a089ffe..d540dbc 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 9b662ff..4b47851 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 ad06225..7cf46c4 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 f50efe5..ffd057b 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 bea0fed..147de5e 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 50acad4..e3263a1 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 1cc195c..8cdbdd0 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From c380f8f9960fa1a9be84dd6ccb69c4a3ba886177 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Mon, 10 Jul 2017 20:00:02 +0200 Subject: [PATCH 2/2] recommit for updates in build 10 --- CHANGELOG.md | 45 +++++++++++++++++++ REPOSTRUCTURE.md | 3 +- doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- 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, 59 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ece9a1b..7105b6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,51 @@ Changelog of Git Changelog.

No issue

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

+

recommit for updates in build 9

+ +

+ +

v0.0.1.2

+

No issue

+ + +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 +

+

removed sites and simply added the examples

+ +

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

+

added vhost examples

+ +

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

+

added vhost examples

+ +

+ +

v0.0.1.1

+

No issue

+ + +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 +

+

updated README

+ +

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

recommit for updates in build 4

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index dfe3469..974f53d 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -48,6 +48,7 @@ |-- Gemfile |-- Gemfile.lock |-- Jenkinsfile +|-- LICENSE `-- README.md -9 directories, 41 files +9 directories, 42 files diff --git a/doc/_index.html b/doc/_index.html index e203efc..f1f0e52 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 2cab477..20c86a7 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -277,7 +277,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index a1878d0..ab6ed9a 100644 --- a/doc/index.html +++ b/doc/index.html @@ -277,7 +277,7 @@ environments.

diff --git a/doc/puppet_classes/cd_apache.html b/doc/puppet_classes/cd_apache.html index d2c1329..53585c5 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 bbef899..70a700c 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 d540dbc..f1acf58 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 4b47851..1748e5d 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 7cf46c4..e747b04 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 ffd057b..71a408a 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 147de5e..ce9297d 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 e3263a1..74a4652 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 8cdbdd0..1d55399 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@