confdroid/confdroid_apache
3
0
Fork 0
Code Issues Projects Wiki Activity

Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_apache into HEAD

Browse Source
This commit is contained in:
Jenkins Server
2017-07-10 19:59:43 +02:00
parent df0edc483d 77dbf09b60
commit e28fdc10ca
14 changed files with 88 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
<h2> No issue </h2>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/36dc5918e52df38">36dc5918e52df38</a> Jenkins Server <i>2017-07-07 16:41:30</i>
<p>
<h3>recommit for updates in build 4</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/3715b3a582a1a5a">3715b3a582a1a5a</a> Arne Teuke <i>2017-07-07 16:40:31</i>
<p>
<h3>updated README</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/871d6e65baf4ec4">871d6e65baf4ec4</a> Jenkins Server <i>2017-07-07 16:38:35</i>
<p>
<h3>recommit for updates in build 3</h3>

5
REPOSTRUCTURE.md
View File

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

2
doc/_index.html
View File

@@ -137,7 +137,7 @@
</div>
<div id="footer">
Generated on Fri Jul 7 18:41:28 2017 by
Generated on Sun Jul 9 17:24:05 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>

38
doc/file.README.html
View File

@@ -61,7 +61,7 @@
<p>|Repo Name| version | Build
Status|
|---|---|---|---|
|<code>cd_apache</code>| 0.0.1.0 | <a
|<code>cd_apache</code>| 0.0.1.2 | <a
href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache">{Build
Status</a>/]|</p>
@@ -70,10 +70,9 @@ Status</a>/]|</p>
<p><code>Apache httpd</code> is a very powerful and widely used web server.</p>
<p><code>cd_apache</code> 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.</p>
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.</p>
<h3 id="label-WARNING">WARNING</h3>
@@ -139,6 +138,33 @@ system permissions
<p>Maintenance
* manage the service</p>
<h4 id="label-vHosts">vHosts</h4>
<p>As stated in the ynopsis, this module was written particularly for usage as
base module. <code>Apache httpd</code> has a great number of usae cases
where it actually is not used directly as full blown webser, but instead as
&#39;sub-service&#39;. Examples here would be</p>
<ul><li>
<p>frontend proxy for other applications to avoid having to put the port
number into the URL</p>
</li><li>
<p>applications like phpMyAdmin, phpPgAdmin</p>
</li><li>
<p>WordPress</p>
</li><li>
<p>Nagios etc.</p>
</li></ul>
<p>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 <code>cd_apache</code> 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 <code>cd_apache</code> as requirement (i.e. require cd_apache) so it
gets installed automatically.</p>
<h3 id="label-Repo+Structure">Repo Structure</h3>
<p>Repostructure as been moved to REPOSTRUCTURE.md</p>
@@ -251,7 +277,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Fri Jul 7 18:41:29 2017 by
Generated on Sun Jul 9 17:24:06 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>

38
doc/index.html
View File

@@ -61,7 +61,7 @@
<p>|Repo Name| version | Build
Status|
|---|---|---|---|
|<code>cd_apache</code>| 0.0.1.0 | <a
|<code>cd_apache</code>| 0.0.1.2 | <a
href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache">{Build
Status</a>/]|</p>
@@ -70,10 +70,9 @@ Status</a>/]|</p>
<p><code>Apache httpd</code> is a very powerful and widely used web server.</p>
<p><code>cd_apache</code> 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.</p>
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.</p>
<h3 id="label-WARNING">WARNING</h3>
@@ -139,6 +138,33 @@ system permissions
<p>Maintenance
* manage the service</p>
<h4 id="label-vHosts">vHosts</h4>
<p>As stated in the ynopsis, this module was written particularly for usage as
base module. <code>Apache httpd</code> has a great number of usae cases
where it actually is not used directly as full blown webser, but instead as
&#39;sub-service&#39;. Examples here would be</p>
<ul><li>
<p>frontend proxy for other applications to avoid having to put the port
number into the URL</p>
</li><li>
<p>applications like phpMyAdmin, phpPgAdmin</p>
</li><li>
<p>WordPress</p>
</li><li>
<p>Nagios etc.</p>
</li></ul>
<p>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 <code>cd_apache</code> 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 <code>cd_apache</code> as requirement (i.e. require cd_apache) so it
gets installed automatically.</p>
<h3 id="label-Repo+Structure">Repo Structure</h3>
<p>Repostructure as been moved to REPOSTRUCTURE.md</p>
@@ -251,7 +277,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Fri Jul 7 18:41:28 2017 by
Generated on Sun Jul 9 17:24:06 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>

2
doc/puppet_classes/cd_apache.html
View File

@@ -140,7 +140,7 @@ class cd_apache {
</div>
<div id="footer">
Generated on Fri Jul 7 18:41:29 2017 by
Generated on Sun Jul 9 17:24:06 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>

2
doc/puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html
View File

@@ -153,7 +153,7 @@ class cd_apache::main::config (
</div>
<div id="footer">
Generated on Fri Jul 7 18:41:29 2017 by
Generated on Sun Jul 9 17:24:07 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>

2
doc/puppet_classes/cd_apache_3A_3Aparams.html
View File

@@ -525,7 +525,7 @@ $ae_userdir_erb = &#39;cd_apache/userdir_conf.erb&#39;
</div>
<div id="footer">
Generated on Fri Jul 7 18:41:29 2017 by
Generated on Sun Jul 9 17:24:07 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>

2
doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html
View File

@@ -528,7 +528,7 @@ class cd_apache::server::dirs (
</div>
<div id="footer">
Generated on Fri Jul 7 18:41:29 2017 by
Generated on Sun Jul 9 17:24:07 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>

2
doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
View File

@@ -323,7 +323,7 @@ class cd_apache::server::files (
</div>
<div id="footer">
Generated on Fri Jul 7 18:41:29 2017 by
Generated on Sun Jul 9 17:24:07 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>

2
doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html
View File

@@ -159,7 +159,7 @@ class cd_apache::server::install (
</div>
<div id="footer">
Generated on Fri Jul 7 18:41:29 2017 by
Generated on Sun Jul 9 17:24:07 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>

2
doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html
View File

@@ -165,7 +165,7 @@ class cd_apache::server::service (
</div>
<div id="footer">
Generated on Fri Jul 7 18:41:29 2017 by
Generated on Sun Jul 9 17:24:07 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>

2
doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html
View File

@@ -209,7 +209,7 @@ class cd_apache::server::user (
</div>
<div id="footer">
Generated on Fri Jul 7 18:41:29 2017 by
Generated on Sun Jul 9 17:24:07 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>

2
doc/top-level-namespace.html
View File

@@ -90,7 +90,7 @@
</div>
<div id="footer">
Generated on Fri Jul 7 18:41:29 2017 by
Generated on Sun Jul 9 17:24:06 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>