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/README.md b/README.md index 51a49d9..4a73c17 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_apache`| 0.0.1.0 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache)](https://jenkins.confdroid.com/job/cd_apache/)| +|`cd_apache`| 0.0.1.2 | [![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. -`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. +`cd_apache` automates the installation and configuration of 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 `**__!!! Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previuos configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production!!! __**` @@ -44,6 +44,16 @@ Configuration 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 + +* frontend proxy for other applications to avoid having to put the port number into the URL +* applications like phpMyAdmin, phpPgAdmin +* WordPress +* Nagios etc. + +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 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 @@ diff --git a/examples/vhost.erb b/examples/vhost.erb new file mode 100644 index 0000000..da0aa5a --- /dev/null +++ b/examples/vhost.erb @@ -0,0 +1,22 @@ + > + ServerAdmin <%= @ae_server_admin%> + ServerName www.<%= @ae_server_name %> + ServerAlias <%= @ae_server_name %> + DocumentRoot <%= @ae_doc_root %> + + <% if @ae_use_https == true and @ae_http_https_fw == true -%> + Redirect permanent / https://<%= @ae_server_name %>/ + <% else -%> + DirectoryIndex <%= @ae_dir_index %> + + AllowOverride none + Order Allow,Deny + Allow from <%= @ae_allow_from %> + + <% end %> + ErrorLog /var/log/httpd/<%= @ae_server_name%>_error_log + <% if @ae_use_access_log == true %> + CustomLog /var/log/httpd/<%= @ae_server_name%>_access_log common + <% end %> + LogLevel <%= @ae_vhost_loglevel %> + diff --git a/examples/vhost_ssl.erb b/examples/vhost_ssl.erb new file mode 100644 index 0000000..eedbfaa --- /dev/null +++ b/examples/vhost_ssl.erb @@ -0,0 +1,37 @@ + > + ServerAdmin <%= @ae_server_admin %> + DocumentRoot <%= @ae_doc_root %> + ServerName www.<%= @ae_server_name %> + ServerAlias <%= @ae_server_name %> + DirectoryIndex <%= @ae_dir_index %> + ErrorLog /var/log/httpd/<%= @ae_server_name %>_ssl_error_log + TransferLog /var/log/httpd/<%= @ae_server_name%>_ssl_transfer_log + CustomLog /var/log/httpd/<%= @ae_server_name%>_ssl_access_log common + LogLevel <%= @ae_vhost_loglevel %> + SSLEngine on + SSLProtocol <%= @ae_ssl_protocols%> + SSLCipherSuite "<%= @ae_ssl_ciphersuite%>" + SSLCertificateFile <%= @ae_tls_cert_path %>/<%= @ae_ssl_vhost_cert %> + SSLCertificateKeyFile <%= @ae_tls_key_path %>/<%= @ae_ssl_vhost_key %> + SSLCertificateChainFile <%= @ae_tls_cert_path %>/<%= @ae_ssl_vhost_chain %> + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + + AllowOverride none + Order Allow,Deny + Allow from <%= @ae_allow_from %> + + + SetEnvIf User-Agent ".*MSIE.*" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + + CustomLog logs/ssl_request_log \ + "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" +