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: da85d8b5713c
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: 8d4c8b54b97f
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 23, 2014

  1. Fixes #163: move redis into its own role

    Sam Kottler committed Mar 23, 2014

    Verified

    This commit was signed with the committer’s verified signature.
    makenowjust Hiroya Fujinami
    Copy the full SHA
    43b4b0e View commit details
  2. Fixes #162: move memcached to its own role

    Sam Kottler committed Mar 23, 2014
    Copy the full SHA
    8d4c8b5 View commit details
Showing with 36 additions and 13 deletions.
  1. +1 −13 chef/roles/app.rb
  2. +19 −0 chef/roles/memcached.rb
  3. +16 −0 chef/roles/redis.rb
14 changes: 1 addition & 13 deletions chef/roles/app.rb
Original file line number Diff line number Diff line change
@@ -2,8 +2,6 @@
description "Just enough sauce to run the app server."
run_list(
"role[base]",
"recipe[memcached]",
"recipe[redis::server]",
"recipe[rubygems::stat-update]",
"recipe[git]",
"recipe[nginx::server]",
@@ -16,17 +14,7 @@
)

default_attributes(
"memcached" => {
"memory" => 128,
"user" => "memcache",
"port" => 11211,
"listen" => "127.0.0.1"
},
"monit" => {
"monitors" => ["redis", "nginx", "memcached"]
},
"redis" => {
"maxmemory" => "8gb",
"dir" => "/var/lib/redis_data"
"monitors" => ["nginx"]
}
)
19 changes: 19 additions & 0 deletions chef/roles/memcached.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name 'memcached'
description 'Memcached node for object caching.'
run_list(
"role[base]",
"recipe[memcached]"
)

# TODO: memcached will need to listen on eth0 instead of localhost.
default_attributes(
"memcached" => {
"memory" => 128,
"user" => "memcache",
"port" => 11211,
"listen" => "127.0.0.1"
},
"monit" => {
"monitors" => ["memcached"]
}
)
16 changes: 16 additions & 0 deletions chef/roles/redis.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name 'redis'
description 'Redis node for storing gem download information.'
run_list(
"role[base]",
"recipe[redis::server]"
)

default_attributes(
"redis" => {
"maxmemory" => "8gb",
"dir" => "/var/lib/redis_data"
},
"monit" => {
"monitors" => ["redis"]
}
)