Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git://github.com/opscode-cookbooks/apache2

  • Loading branch information...
commit 0a50b6c44c0a992d191b8b740788817195b406d9 2 parents e378408 + e340cef
@patcoll authored
Showing with 8 additions and 2 deletions.
  1. +5 −0 CHANGELOG.md
  2. +2 −1  definitions/web_app.rb
  3. +1 −1  metadata.rb
View
5 CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.3.2:
+
+* [COOK-1804] - fix `web_app` definition parameter so site can be
+ disabled.
+
## v1.3.0:
* [COOK-1738] - Better configuration for `mod_include` and some
View
3  definitions/web_app.rb
@@ -43,7 +43,8 @@
end
end
+ site_enabled = params[:enable]
apache_site "#{params[:name]}.conf" do
- enable params[:enable]
+ enable site_enabled
end
end
View
2  metadata.rb
@@ -4,7 +4,7 @@
license "Apache 2.0"
description "Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "1.3.0"
+version "1.3.2"
recipe "apache2", "Main Apache configuration"
recipe "apache2::logrotate", "Rotate apache2 logs. Requires logrotate cookbook"
recipe "apache2::mod_alias", "Apache module 'alias' with config file"
Please sign in to comment.
Something went wrong with that request. Please try again.