From 061d470330dd09070c8c854162aa8fbe0940703a Mon Sep 17 00:00:00 2001 From: Fabio Todaro Date: Wed, 30 Nov 2016 16:59:54 +0100 Subject: [PATCH 1/2] Change Include to IncludeOption for optional config to prevent error, Fix #44 --- templates/default/mods/mod-security.conf.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/default/mods/mod-security.conf.erb b/templates/default/mods/mod-security.conf.erb index 30430b7..3cd9881 100644 --- a/templates/default/mods/mod-security.conf.erb +++ b/templates/default/mods/mod-security.conf.erb @@ -6,11 +6,11 @@ Include "<%= node[:mod_security][:dir] %>/*.conf" # Wildcard the mod_security settings file so that Apache doesn't break if missing - Include <%= "#{node[:mod_security][:crs][:rules_root_dir]}/modsecurity_crs_*.conf" %> + IncludeOptional <%= "#{node[:mod_security][:crs][:rules_root_dir]}/modsecurity_crs_*.conf" %> # Core rule sets that have been activated - Include <%= "#{node[:mod_security][:crs][:activated_rules]}/*.conf" %> + IncludeOptional <%= "#{node[:mod_security][:crs][:activated_rules]}/*.conf" %> # User crafted rules - Include <%= "#{node[:mod_security][:rules]}/*.conf" %> + IncludeOptional <%= "#{node[:mod_security][:rules]}/*.conf" %> From 055a3cbac6627dc0ab8fe15b19234af0d3ab5373 Mon Sep 17 00:00:00 2001 From: Frank Breedijk Date: Mon, 30 Jan 2017 16:06:40 +0100 Subject: [PATCH 2/2] Fixes #44 - @SharEdgeMarshall pointed out that IncludeOption is better --- metadata.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata.rb b/metadata.rb index acb512c..7a879e1 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,10 +1,10 @@ name 'mod_security' -maintainer 'HoneyApps Inc.' -maintainer_email 'jro@honeyapps.com' +maintainer 'Schuberg Philis' +maintainer_email 'fbreedijk@schubergphilis.com' license 'Apache 2.0' description 'Installs and configures mod_security for Apache2 or IIS' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.2.5' +version '0.2.6' depends 'apache2' depends 'build-essential'