From ef4e41395b0e8af083815ebafdb903867059ab89 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sun, 9 Jul 2017 16:15:32 +0100 Subject: [PATCH] updated README with vhost details and updated version --- README.md | 4 ++-- {templates/vhost/CentOS/6 => examples}/vhost.erb | 0 {templates/vhost/CentOS/6 => examples}/vhost_ssl.erb | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {templates/vhost/CentOS/6 => examples}/vhost.erb (100%) rename {templates/vhost/CentOS/6 => examples}/vhost_ssl.erb (100%) diff --git a/README.md b/README.md index ec20628..4198f57 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |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.1 | [![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. @@ -52,7 +52,7 @@ As stated in the ynopsis, this module was written particularly for usage as base * 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. The exact layout for your particular vhost configuration files depend a lot on your application and organization requirements, and cannot be predicted from outside per se. +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/templates/vhost/CentOS/6/vhost.erb b/examples/vhost.erb similarity index 100% rename from templates/vhost/CentOS/6/vhost.erb rename to examples/vhost.erb diff --git a/templates/vhost/CentOS/6/vhost_ssl.erb b/examples/vhost_ssl.erb similarity index 100% rename from templates/vhost/CentOS/6/vhost_ssl.erb rename to examples/vhost_ssl.erb