Merge pull request #46 from /issues/44-base-install-broken

Issues/44 base install broken
schubergphilis · Jan 30, 2017 · 7496fac · 7496fac
2 parents 46f4bd9 + 055a3cb
commit 7496fac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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'

diff --git 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" %>
 </IfModule>