Skip to content
This repository has been archived by the owner on Apr 23, 2019. It is now read-only.

Commit

Permalink
Merge pull request #195 from intercity/add-ruby-2-1-0-binary
Browse files Browse the repository at this point in the history
Install ruby 2.1.0 from binaries since source is broken
  • Loading branch information
michiels committed Apr 22, 2015
2 parents f10bbb7 + 2a3731a commit 1ecaa1a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This project makes use of the [Sementic Versioning](http://semver.org/)
## 2.4.0 - TBA

### Added
- Ruby 2.1.5 and 2.2.1 are now installed from binaries
- Ruby 2.1.0, 2.1.5 and 2.2.1 are now installed from binaries
- Ability to remove an application from your server
- Allow client_max_body_size configuration per application
- Sets secure defaults for SSL protocol and ciphers
Expand Down
4 changes: 2 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end

config.vm.provider "vmware_fusion" do |v|
v.vmx["memsize"] = "1024"
v.vmx["memsize"] = "2048"
v.vmx["numvcpus"] = "2"
end
#
Expand All @@ -92,7 +92,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
},
"active_applications" => {
"intercity_sample_app" => {
ruby_version: "2.1.5",
ruby_version: "2.1.0",
domain_names: ["localhost"],
packages: ["nodejs"],
rails_env: "staging",
Expand Down
2 changes: 1 addition & 1 deletion vendor/cookbooks/rails/attributes/default.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
default["rails"]["applications_root"] = "/u/apps"
default["rbenv"]["binaries_url"] = "http://binaries.intercityup.com/ruby/ubuntu"
default["rbenv"]["available_binaries"] = %w(1.9.3-p547 2.0.0-p481 2.1.1 2.1.2 2.1.3 2.1.5 2.2.1)
default["rbenv"]["available_binaries"] = %w(1.9.3-p547 2.0.0-p481 2.1.0 2.1.1 2.1.2 2.1.3 2.1.5 2.2.1)

case node["platform_family"]
when "debian"
Expand Down

0 comments on commit 1ecaa1a

Please sign in to comment.