Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issues/44 base install broken #46

Merged
merged 2 commits into from
Jan 30, 2017
Merged

Issues/44 base install broken #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
061d470
Change Include to IncludeOption for optional config to prevent error,…
Nov 30, 2016
055a3cb
Fixes #44 - @SharEdgeMarshall pointed out that IncludeOption is better
MrSeccubus Jan 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
6 changes: 3 additions & 3 deletions templates/default/mods/mod-security.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>