From 4f47b9a881357d3fc6fe5b9ce43cf4398e6e6b1c Mon Sep 17 00:00:00 2001 From: sgnl05 Date: Mon, 15 Jan 2018 13:09:28 +0100 Subject: [PATCH] added ssl_chain and updated documentation --- CHANGELOG.md | 7 ++++--- README.md | 23 +++++++++++------------ manifests/apache.pp | 10 ++++++---- manifests/init.pp | 1 + metadata.json | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11850ef..160c725 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ -### 0.3.3-1 2016-06-21 +### 0.3.4 2018-01-15 update: harden apache security (#11) by Roman Spiak + update: added ssl_chain parameter to apache install ### 0.3.3 2015-10-26 - update: Permit user-determined secret.php contents (#8) by Matt Simmons + update: permit user-determined secret.php contents (#8) by Matt Simmons ### 0.3.2 2015-03-10 update: template file for inc/secret.php complete (#7) @@ -10,7 +11,7 @@ ### 0.3.1 2015-03-09 bugfix: fix warning "Could not look up qualified variable '::apache::default_ssl_cert'; class ::apache has not been evaluated" on Puppet version 3.4.x. update: added $user_auth_src and $require_local_account settings to template - update: Better parameter validations + update: better parameter validations ### 0.3.0 2015-03-07 new feature: SSL certificates (#4) diff --git a/README.md b/README.md index d7401d8..42fb5d1 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Handling the permissions of secret.php at installation step 3 and 4 of can be as ```puppet class { '::racktables': vost => 'racktables.example.com', - release => 'RackTables-0.20.10', + release => 'RackTables-0.20.14', secretfile => file('/path/to/file'), } ``` @@ -73,7 +73,7 @@ Install RackTables with a new local database: ```puppet class { '::racktables': vhost => 'racktables.example.com', - release => 'RackTables-0.20.10', + release => 'RackTables-0.20.14', install_db => true, db_name => 'racktables', db_username => 'racktables', @@ -86,7 +86,7 @@ Install RackTables, using a remote database with existing RackTables data: ```puppet class { '::racktables': vhost => 'racktables.example.com', - release => 'RackTables-0.20.10', + release => 'RackTables-0.20.14', db_name => 'example_db_name', db_username => 'example_username', db_password => 'example_password', @@ -192,7 +192,7 @@ Defaults to undef. Example class: ```puppet class { '::racktables': vhost => 'racktables.example.com', - release => 'RackTables-0.20.10', + release => 'RackTables-0.20.14', user_auth_src => 'ldap', require_local_account => false, ldap_options => { @@ -218,7 +218,7 @@ Defaults to undef. Example class: ```puppet class { '::racktables': vhost => 'racktables.example.com', - release => 'RackTables-0.20.10', + release => 'RackTables-0.20.14', user_auth_src => 'saml', require_local_account => false, saml_options => { @@ -251,6 +251,11 @@ Defaults to undef. String. Specifies the location of the SSL key. Defaults to undef. +#####`ssl_chain` + +String. Specifies the location of the SSL chain. +Defaults to undef. + #####`apacheuser` String. Specifies the apache user. Used for setting permissions to inc/secret.php. @@ -296,14 +301,8 @@ Defaults to 'https://github.com/RackTables/racktables.git'. * `racktables::params`: Default parameters -## Limitations - -#####RHEL 7 - -Should work, but has not been tested. - ## Development ###Contributing -Please use the issue tracker (https://github.com/sgnl05/sgnl05-racktables/issues) for any type of contribution. +Please use pull requests (https://github.com/sgnl05/sgnl05-racktables/pulls) for any type of contribution. diff --git a/manifests/apache.pp b/manifests/apache.pp index 9a394bd..d1dcec2 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -1,9 +1,10 @@ # Installs apache and racktables vhost class racktables::apache ( - $vhost = $::racktables::vhost, - $ssl_cert = $::racktables::ssl_cert, - $ssl_key = $::racktables::ssl_key, - $datadir = $::racktables::datadir, + $vhost = $::racktables::vhost, + $ssl_cert = $::racktables::ssl_cert, + $ssl_key = $::racktables::ssl_key, + $ssl_chain = $::racktables::ssl_chain, + $datadir = $::racktables::datadir, ) { validate_string($vhost) @@ -48,6 +49,7 @@ ssl => true, ssl_cert => $ssl_cert, ssl_key => $ssl_key, + ssl_chain => $ssl_chain, override => 'AuthConfig', require => Vcsrepo[$datadir], } diff --git a/manifests/init.pp b/manifests/init.pp index 4ae4195..cb97cf9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -54,6 +54,7 @@ $helpdesk_banner = undef, $ssl_cert = undef, $ssl_key = undef, + $ssl_chain = undef, $apacheuser = $racktables::params::apacheuser, $datadir = $racktables::params::datadir, $packages = $racktables::params::packages, diff --git a/metadata.json b/metadata.json index 05d3a20..5c990aa 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "sgnl05-racktables", - "version": "0.3.3", + "version": "0.3.4", "author": "sgnl05", "summary": "Installs RackTables with all dependencies", "license": "Apache-2.0",