Skip to content
This repository has been archived by the owner on Nov 30, 2017. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubygems/rubygems-aws
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4ee72c50afee
Choose a base ref
...
head repository: rubygems/rubygems-aws
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6040e2831ead
Choose a head ref
  • 2 commits
  • 10 files changed
  • 2 contributors

Commits on Dec 13, 2013

  1. cleanup roles

    most of these were not even being used
    dwradcliffe committed Dec 13, 2013
    Copy the full SHA
    433b3ae View commit details

Commits on Jan 16, 2014

  1. Merge pull request #153 from dwradcliffe/cleanup-roles

    more role cleanup
    Sam Kottler committed Jan 16, 2014
    Copy the full SHA
    6040e28 View commit details
9 changes: 0 additions & 9 deletions chef/nodes/app.production.json
Original file line number Diff line number Diff line change
@@ -43,15 +43,6 @@
// Hostname
"set_fqdn": "app01.rubygems.org",

// memcached
"memcached": {
"memory": 128,
"user": "memcache",
"port": 11211,
"listen": "127.0.0.1"
},


// new relic rpm
"new_relic": {
"license_key": "" // your key for server monitoring here
2 changes: 1 addition & 1 deletion chef/nodes/app.vagrant.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
// run list
"run_list": ["role[almost_fullstack]", "role[vagrant]"],
"run_list": ["role[app]", "role[vagrant]"],

// rubygems Rails application attributes
"application": {
2 changes: 1 addition & 1 deletion chef/nodes/dbmaster.production.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"run_list": ["role[rubygems_db_master]"],
"run_list": ["role[db_master]"],
"sudo" : {
"add_vagrant" : false
}
2 changes: 1 addition & 1 deletion chef/nodes/dbmaster.vagrant.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"run_list": ["role[rubygems_db_master]", "role[vagrant]"]
"run_list": ["role[db_master]", "role[vagrant]"]
}
10 changes: 0 additions & 10 deletions chef/roles/almost_fullstack.rb

This file was deleted.

17 changes: 15 additions & 2 deletions chef/roles/app.rb
Original file line number Diff line number Diff line change
@@ -5,12 +5,25 @@
"recipe[memcached]",
"recipe[redis::server]",
"recipe[rubygems::stat-update]",
"role[rubygems]"
"recipe[git]",
"recipe[nginx::server]",
"recipe[nodejs]",
"recipe[postgresql::libpq]",
"recipe[rubygems::environment_variables]",
"recipe[rubygems::monit]",
"recipe[rubygems::rails]",
"recipe[rubygems::rails_nginx]"
)

default_attributes(
"memcached" => {
"memory" => 128,
"user" => "memcache",
"port" => 11211,
"listen" => "127.0.0.1"
},
"monit" => {
"monitors" => ["redis", "nginx"]
"monitors" => ["redis", "nginx", "memcached"]
},
"redis" => {
"maxmemory" => "8gb",
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name "rubygems_db_master"
name "db_master"
description "The role for the primary database server for the RubyGems.org app"

run_list(
10 changes: 0 additions & 10 deletions chef/roles/fullstack.rb

This file was deleted.

12 changes: 0 additions & 12 deletions chef/roles/rubygems.rb

This file was deleted.

19 changes: 0 additions & 19 deletions chef/roles/rubygems_memcached.rb

This file was deleted.