From 885263681f44d8103efef86a9492c770252b3b05 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 16 Nov 2015 12:59:12 +0100 Subject: [bug] use guess_apache_version() to query apache version Using $::apache_version won't work because the facts are evaluated before compiling the catalog and with this, before the installation of apache. so on an install from scratch, this fact won't contain anything. --- manifests/module/alias.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/module/alias.pp b/manifests/module/alias.pp index 26d9f4a..33d26ef 100644 --- a/manifests/module/alias.pp +++ b/manifests/module/alias.pp @@ -7,7 +7,7 @@ class apache::module::alias ( $ensure = present ) # from 2.4, /etc/apache2/mods-enabled/alias.conf contains the "Require" # directive which needs "authz_core" mod enabled - if ( versioncmp($::apache_version, '2.4') >= 0 ) { + if ( guess_apache_version() == '2.4') { class { 'authz_core': ensure => $ensure } } -- cgit v1.2.3 From cb76fabaf1cefcfb58cc12a29afc7ba252913201 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 25 Feb 2016 14:55:55 +0100 Subject: Provide ssl cipher suite defaults We don't want to depend on too many modules. The `$ssl_cipher_suite` parameter is the only dependency to the `cert` module and I think it's ok to remove this dependency. It's now a hardcoded default taken from the puppetlabs apache module (https://github.com/puppetlabs/puppetlabs-apache/blob/master/README.md#ssl_cipher) Ppl who use the cert class will know how to pass the parameter. See https://gitlab.com/shared-puppet-modules-group/apache/issues/9 for the discussion. --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/init.pp b/manifests/init.pp index 1079d85..ad1478a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -22,7 +22,7 @@ class apache( $default_ssl_certificate_file = absent, $default_ssl_certificate_key_file = absent, $default_ssl_certificate_chain_file = absent, - $ssl_cipher_suite = $certs::ssl_config::ciphers_http + $ssl_cipher_suite = 'HIGH:MEDIUM:!aNULL:!MD5' ) { case $::operatingsystem { centos: { include apache::centos } -- cgit v1.2.3