Skip to content
Browse files

COOK-324, update apache2 attributes

  • Loading branch information...
1 parent 8a6d9c0 commit 9bb284719d214ba9fa4405e60f824afb1fc9ede7 @jtimberman jtimberman committed Jul 10, 2010
Showing with 34 additions and 34 deletions.
  1. +22 −22 attributes/default.rb
  2. +11 −11 metadata.json
  3. +1 −1 metadata.rb
View
44 attributes/default.rb
@@ -45,33 +45,33 @@
###
# General settings
-set_unless[:apache][:listen_ports] = [ "80","443" ]
-set_unless[:apache][:contact] = "ops@example.com"
-set_unless[:apache][:timeout] = 300
-set_unless[:apache][:keepalive] = "On"
-set_unless[:apache][:keepaliverequests] = 100
-set_unless[:apache][:keepalivetimeout] = 5
+default[:apache][:listen_ports] = [ "80","443" ]
+default[:apache][:contact] = "ops@example.com"
+default[:apache][:timeout] = 300
+default[:apache][:keepalive] = "On"
+default[:apache][:keepaliverequests] = 100
+default[:apache][:keepalivetimeout] = 5
# Security
-set_unless[:apache][:servertokens] = "Prod"
-set_unless[:apache][:serversignature] = "On"
-set_unless[:apache][:traceenable] = "On"
+default[:apache][:servertokens] = "Prod"
+default[:apache][:serversignature] = "On"
+default[:apache][:traceenable] = "On"
# mod_auth_openids
-set_unless[:apache][:allowed_openids] = Array.new
+default[:apache][:allowed_openids] = Array.new
# Prefork Attributes
-set_unless[:apache][:prefork][:startservers] = 16
-set_unless[:apache][:prefork][:minspareservers] = 16
-set_unless[:apache][:prefork][:maxspareservers] = 32
-set_unless[:apache][:prefork][:serverlimit] = 400
-set_unless[:apache][:prefork][:maxclients] = 400
-set_unless[:apache][:prefork][:maxrequestsperchild] = 10000
+default[:apache][:prefork][:startservers] = 16
+default[:apache][:prefork][:minspareservers] = 16
+default[:apache][:prefork][:maxspareservers] = 32
+default[:apache][:prefork][:serverlimit] = 400
+default[:apache][:prefork][:maxclients] = 400
+default[:apache][:prefork][:maxrequestsperchild] = 10000
# Worker Attributes
-set_unless[:apache][:worker][:startservers] = 4
-set_unless[:apache][:worker][:maxclients] = 1024
-set_unless[:apache][:worker][:minsparethreads] = 64
-set_unless[:apache][:worker][:maxsparethreads] = 192
-set_unless[:apache][:worker][:threadsperchild] = 64
-set_unless[:apache][:worker][:maxrequestsperchild] = 0
+default[:apache][:worker][:startservers] = 4
+default[:apache][:worker][:maxclients] = 1024
+default[:apache][:worker][:minsparethreads] = 64
+default[:apache][:worker][:maxsparethreads] = 192
+default[:apache][:worker][:threadsperchild] = 64
+default[:apache][:worker][:maxrequestsperchild] = 0
View
22 metadata.json
@@ -1,5 +1,5 @@
{
- "recommendations": {
+ "providing": {
},
"attributes": {
"apache/traceenable": {
@@ -423,13 +423,13 @@
"display_name": "Apache Prefork MPM MaxSpareServers"
}
},
- "maintainer": "Opscode, Inc.",
- "suggestions": {
+ "replacing": {
},
"dependencies": {
},
- "maintainer_email": "cookbooks@opscode.com",
- "conflicting": {
+ "groupings": {
+ },
+ "recommendations": {
},
"platforms": {
"debian": [
@@ -446,8 +446,9 @@
]
},
"license": "Apache 2.0",
- "version": "0.12.0",
- "providing": {
+ "version": "0.12.1",
+ "maintainer": "Opscode, Inc.",
+ "suggestions": {
},
"recipes": {
"apache2::mod_dav": "Apache module 'dav'",
@@ -487,11 +488,10 @@
"apache2::mod_dir": "Apache module 'dir' with config file",
"apache2::mod_authz_default": "Apache module 'authz_default'"
},
- "replacing": {
- },
+ "maintainer_email": "cookbooks@opscode.com",
"name": "apache2",
- "description": "Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions",
- "groupings": {
+ "conflicting": {
},
+ "description": "Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions",
"long_description": "= DESCRIPTION:\n\nComplete Debian/Ubuntu style Apache2 configuration.\n\n= REQUIREMENTS:\n\nDebian or Ubuntu preferred.\n\nRed Hat/CentOS and Fedora can be used but will be converted to a Debian/Ubuntu style Apache as it's far easier to manage with chef. \n\n= ATTRIBUTES:\n\nThe file attributes/apache.rb contains the following attribute types:\n\n* platform specific locations and settings.\n* general settings\n* prefork attributes\n* worker attributes\n\nGeneral settings and prefork/worker attributes are tunable.\n\n= USAGE:\n\nInclude the apache2 recipe to install Apache2 and get 'sane' default settings. Configuration is modularized through Apache vhost sites a la Debian style configuration.\n\nFor Red Hat, CentOS and Fedora you should first disable selinux as it's not supported (yet), then remove the stock httpd and all it's dependencies prior to attempting to use this recipe. Many packages in these distributions drop conflicting configs into conf.d, all of which haven't been accounted for yet. Starting from scratch will also make it far easier to debug.\n\n== Defines:\n\n* apache_module: sets up an Apache module.\n* apache_conf: sets up a config file for an apache module.\n* apache_site: sets up a vhost site. The conf file must be available.\n* web_app: copies the template for a web app and enables it as a site via apache_site.\n\n== Web Apps:\n\nVarious applications that can be set up with Apache as the front end, such as PHP, Django, Rails and others can use the web_app define to set up the template and the Apache site. The define is kind of dumb, so the template needs have the application implementation settings, since we don't know what your app is or what is needed from Apache.\n\nWe only prototype one parameter for the web_app define, \"template\". This is used to specify the name of the template to use in the current cookbook. When you use web_app, you can set up any parameters you want to use in your template. They will get passed to the template through the params hash. For example, the sample web_app.conf.erb template in this cookbook makes use of these.\n\n* docroot\n* server_name\n* server_aliases\n\nThese are available as @params[:docroot], @params[:server_name], @params[:server_aliases] within the template. \n\nIf 'cookbook' and 'template' are not specified, the current cookbook's templates/default/web_app.conf.erb will be used. If this template is not suitable for your application, copy it to your cookbook and customize as needed.\n\n== God Monitor:\n\nThere's a new recipe, apache2::god_monitor. You will need to make sure to include the 'god' recipe before using the apache2::god_monitor recipe in your cookbook.\n\n== OpenID Auth\n\nInstalls the mod_auth_openid module from source. Specify an array of OpenIDs that are allowed to authenticate with the attribute apache[:allowed_openids]. Use the following in a vhost to protect with OpenID authentication:\n\n AuthOpenIDEnabled On\n AuthOpenIDDBLocation /var/cache/apache2/mod_auth_openid.db\n AuthOpenIDUserProgram /usr/local/bin/mod_auth_openid.rb\n\nChange the DBLocation as appropriate for your platform. You'll need to change the file in the recipe to match. The UserProgram is optional if you don't want to limit access by certain OpenIDs.\n\n= LICENSE & AUTHOR:\n\nAuthor:: Joshua Timberman (<joshua@opscode.com>)\nCopyright:: 2009, Opscode, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n"
}
View
2 metadata.rb
@@ -3,7 +3,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.rdoc'))
-version "0.12.0"
+version "0.12.1"
recipe "apache2", "Main Apache configuration"
recipe "apache2::mod_alias", "Apache module 'alias' with config file"
recipe "apache2::mod_auth_basic", "Apache module 'auth_basic'"

0 comments on commit 9bb2847

Please sign in to comment.
Something went wrong with that request. Please try again.