Skip to content

Commit 0cb706d

Browse files
author
jtimberman
committed
COOK-324, update passenger and ruby enterprise cookbooks' attributes
1 parent 3ce58ec commit 0cb706d

File tree

9 files changed

+45
-45
lines changed

9 files changed

+45
-45
lines changed

‎passenger_apache2/attributes/default.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
set_unless[:passenger][:version] = "2.2.14"
1+
default[:passenger][:version] = "2.2.15"
22
set[:passenger][:root_path] = "#{languages[:ruby][:gems_dir]}/gems/passenger-#{passenger[:version]}"
33
set[:passenger][:module_path] = "#{passenger[:root_path]}/ext/apache2/mod_passenger.so"

‎passenger_apache2/metadata.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"recommendations": {
2+
"providing": {
33
},
44
"attributes": {
55
"passenger/module_path": {
@@ -45,8 +45,7 @@
4545
"display_name": "Passenger Root Path"
4646
}
4747
},
48-
"maintainer": "Opscode, Inc.",
49-
"suggestions": {
48+
"replacing": {
5049
},
5150
"dependencies": {
5251
"rails": [
@@ -62,8 +61,9 @@
6261

6362
]
6463
},
65-
"maintainer_email": "[email protected]",
66-
"conflicting": {
64+
"groupings": {
65+
},
66+
"recommendations": {
6767
},
6868
"platforms": {
6969
"debian": [
@@ -80,18 +80,18 @@
8080
]
8181
},
8282
"license": "Apache 2.0",
83-
"version": "0.16.2",
84-
"providing": {
83+
"version": "0.16.3",
84+
"maintainer": "Opscode, Inc.",
85+
"suggestions": {
8586
},
8687
"recipes": {
8788
"passenger_apache2": "Installs Passenger as an Apache module",
8889
"passenger_apache2::mod_rails": "Enables Apache module configuration for passenger module"
8990
},
90-
"replacing": {
91-
},
91+
"maintainer_email": "[email protected]",
9292
"name": "passenger_apache2",
93-
"description": "Installs passenger for Apache2",
94-
"groupings": {
93+
"conflicting": {
9594
},
95+
"description": "Installs passenger for Apache2",
9696
"long_description": "= DESCRIPTION:\n\nInstalls passenger for Rails / Rack / Merb hosting.\n\n= REQUIREMENTS:\n\n== Platform:\n\nTested on Ubuntu 8.10. May work on other platforms, esp Ubuntu/Debian. May need work to function on CentOS/Fedora/RHEL.\n\n== Cookbooks:\n\nOpscode cookbooks, http://github.com/opscode/cookbooks/tree/master:\n\n* ruby\n* apache2 (web_app)\n* rails\n\n= ATTRIBUTES: \n\n* passenger[:version] - Specify the version of passenger to install.\n* passenger[:root_path] - The location of the passenger gem.\n* passenger[:module_path] - The location of the compiled passenger apache module.\n* passenger[:apache_load_path] - File to use for loading the passenger apache module.\n* passenger[:apache_conf_path] - Additional passenger module configuration.\n\nThe last two are activated with apache_module.\n\n= USAGE:\n\nFor example, to run a Rails application on passenger:\n\n include_recipe \"rails\"\n include_recipe \"passenger\"\n \n web_app \"myproj\" do\n docroot \"/srv/myproj/public\"\n server_name \"myproj.#{node[:domain]}\"\n server_aliases [ \"myproj\", node[:hostname] ]\n rails_env \"production\"\n end\n\nA sample config template is provided, web_app.conf.erb. If this is suitable for your application, add 'cookbook \"passenger\"' to the define above to use that template. Otherwise, copy the template to the cookbook where you're using web_app, and modify as needed. The cookbook parameter is optional, if omitted it will search the cookbook where the define is used.\n\n= LICENSE and AUTHOR:\n\nAuthor:: Joshua Timberman (<[email protected]>)\nAuthor:: Joshua Sierles (<[email protected]>)\nAuthor:: Michael Hale (<[email protected]>)\n\nCopyright:: 2009, Opscode, Inc\nCopyright:: 2009, 37signals\nCoprighty:: 2009, Michael Hale\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"
9797
}

‎passenger_apache2/metadata.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
license "Apache 2.0"
44
description "Installs passenger for Apache2"
55
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
6-
version "0.16.2"
6+
version "0.16.3"
77

88
recipe "passenger_apache2", "Installs Passenger as an Apache module"
99
recipe "passenger_apache2::mod_rails", "Enables Apache module configuration for passenger module"

‎passenger_enterprise/attributes/default.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
# See the License for the specific language governing permissions and
2424
# limitations under the License.
2525
#
26-
set_unless[:passenger_enterprise][:version] = "2.2.14"
27-
set_unless[:passenger_enterprise][:root_path] = "/opt/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-#{passenger_enterprise[:version]}"
28-
set_unless[:passenger_enterprise][:module_path] = "#{passenger_enterprise[:root_path]}/ext/apache2/mod_passenger.so"
26+
default[:passenger_enterprise][:version] = "2.2.15"
27+
default[:passenger_enterprise][:root_path] = "/opt/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-#{passenger_enterprise[:version]}"
28+
default[:passenger_enterprise][:module_path] = "#{passenger_enterprise[:root_path]}/ext/apache2/mod_passenger.so"

‎passenger_enterprise/metadata.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
2-
"recommendations": {
2+
"providing": {
33
},
44
"attributes": {
55
},
6-
"maintainer": "Opscode, Inc.",
7-
"suggestions": {
6+
"replacing": {
87
},
98
"dependencies": {
109
"nginx": [
@@ -17,28 +16,29 @@
1716

1817
]
1918
},
20-
"maintainer_email": "[email protected]",
21-
"conflicting": {
19+
"groupings": {
20+
},
21+
"recommendations": {
2222
},
2323
"platforms": {
2424
"ubuntu": [
2525

2626
]
2727
},
2828
"license": "Apache 2.0",
29-
"version": "0.4.1",
30-
"providing": {
29+
"version": "0.4.2",
30+
"maintainer": "Opscode, Inc.",
31+
"suggestions": {
3132
},
3233
"recipes": {
3334
"passenger_enterprise": "Installs Passenger gem with Ruby Enterprise Edition",
3435
"passenger_enterprise::nginx": "Installs Passenger gem w/ REE, and recompiles support into Nginx",
3536
"passenger_enterprise::apache2": "Enables Apache module configuration for passenger under Ruby Enterprise Edition"
3637
},
37-
"replacing": {
38-
},
38+
"maintainer_email": "[email protected]",
3939
"name": "passenger_enterprise",
40-
"description": "Installs and configures Passenger under Ruby Enterprise Edition with Apache",
41-
"groupings": {
40+
"conflicting": {
4241
},
42+
"description": "Installs and configures Passenger under Ruby Enterprise Edition with Apache",
4343
"long_description": "= DESCRIPTION:\n\n= REQUIREMENTS:\n\n= ATTRIBUTES:\n\n= USAGE:\n\n"
4444
}

‎passenger_enterprise/metadata.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
license "Apache 2.0"
44
description "Installs and configures Passenger under Ruby Enterprise Edition with Apache"
55
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
6-
version "0.4.1"
6+
version "0.4.2"
77

88
recipe "passenger_enterprise", "Installs Passenger gem with Ruby Enterprise Edition"
99
recipe "passenger_enterprise::apache2", "Enables Apache module configuration for passenger under Ruby Enterprise Edition"

‎ruby_enterprise/attributes/default.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
# limitations under the License.
2424
#
2525

26-
set_unless[:ruby_enterprise][:install_path] = "/opt/ruby-enterprise"
27-
set_unless[:ruby_enterprise][:ruby_bin] = "/opt/ruby-enterprise/bin/ruby"
28-
set_unless[:ruby_enterprise][:gems_dir] = "#{ruby_enterprise[:install_path]}/lib/ruby/gems/1.8"
29-
set_unless[:ruby_enterprise][:version] = '1.8.7-2009.10'
30-
set_unless[:ruby_enterprise][:url] = "http://rubyforge.org/frs/download.php/66162/ruby-enterprise-#{ruby_enterprise[:version]}"
26+
default[:ruby_enterprise][:install_path] = "/opt/ruby-enterprise"
27+
default[:ruby_enterprise][:ruby_bin] = "/opt/ruby-enterprise/bin/ruby"
28+
default[:ruby_enterprise][:gems_dir] = "#{ruby_enterprise[:install_path]}/lib/ruby/gems/1.8"
29+
default[:ruby_enterprise][:version] = '1.8.7-2010.02'
30+
default[:ruby_enterprise][:url] = "http://rubyforge.org/frs/download.php/71096/ruby-enterprise-#{ruby_enterprise[:version]}"

‎ruby_enterprise/metadata.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
{
2-
"recommendations": {
2+
"providing": {
33
},
44
"attributes": {
55
},
6-
"maintainer": "Opscode, Inc.",
7-
"suggestions": {
6+
"replacing": {
87
},
98
"dependencies": {
109
"build-essential": [
1110

1211
]
1312
},
14-
"maintainer_email": "[email protected]",
15-
"conflicting": {
13+
"groupings": {
14+
},
15+
"recommendations": {
1616
},
1717
"platforms": {
1818
"ubuntu": [
1919

2020
]
2121
},
2222
"license": "Apache 2.0",
23-
"version": "0.2.1",
24-
"providing": {
23+
"version": "0.2.2",
24+
"maintainer": "Opscode, Inc.",
25+
"suggestions": {
2526
},
2627
"recipes": {
2728
"ruby_enterprise": "Installs Ruby Enterprise Edition"
2829
},
29-
"replacing": {
30-
},
30+
"maintainer_email": "[email protected]",
3131
"name": "ruby_enterprise",
32-
"description": "Installs/Configures ruby-enterprise",
33-
"groupings": {
32+
"conflicting": {
3433
},
34+
"description": "Installs/Configures ruby-enterprise",
3535
"long_description": "= DESCRIPTION:\n\nInstalls Ruby Enterprise Edition (REE) from Phusion.\n\n= REQUIREMENTS:\n\nOpscode's build-essential cookbook to get a compiler and associated files installed.\n\n= ATTRIBUTES: \n\n* ruby_enterprise[:install_path] - Location to install REE. Default /opt/ruby-enterprise\n* ruby_enterprise[:version] - Version-datestamp to use. Default 1.8.6-20090610. May lag behind latest REE release.\n* ruby_enterprise[:url] - URL to download. Default is from RubyForge, with the version specified. Note the download ID must be updated when there are new releases.\n\n= USAGE:\n\nInclude the ruby_enterprise recipe to install REE.\n\n include_recipe \"ruby_enterprise\"\n\nOr add it to your role, or directly to a node's recipes.\n\nInstall RubyGems under REE with the ree_gem definition.\n\n ree_gem \"rails\" do\n source \"http://gems.rubyforge.org\"\n version \"2.3.4\"\n end\n\nThe definition supports parameters for source and version, though they are optional.\n\n= LICENSE and AUTHOR:\n\nAuthor:: Joshua Timberman (<[email protected]>)\nAuthor:: Sean Cribbs (<[email protected]>)\nAuthor:: Michael Hale (<[email protected]>)\n\nCopyright:: 2009-2010, Opscode, Inc.\nCopyright:: 2009, Sean Cribbs\nCopyright:: 2009, Michael Hale\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\n"
3636
}

‎ruby_enterprise/metadata.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
license "Apache 2.0"
44
description "Installs/Configures ruby-enterprise"
55
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
6-
version "0.2.1"
6+
version "0.2.2"
77

88
recipe "ruby_enterprise", "Installs Ruby Enterprise Edition"
99

0 commit comments

Comments
 (0)