Skip to content
This repository has been archived by the owner on Jul 11, 2020. 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-chef
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b4423f580d54
Choose a base ref
...
head repository: rubygems/rubygems-chef
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a17260fe8168
Choose a head ref
  • 3 commits
  • 9 files changed
  • 1 contributor

Commits on Oct 22, 2014

  1. Copy the full SHA
    e6ae889 View commit details
  2. Copy the full SHA
    7e7a040 View commit details
  3. fix sensu ports

    dwradcliffe committed Oct 22, 2014
    Copy the full SHA
    a17260f View commit details
17 changes: 11 additions & 6 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -170,8 +170,8 @@ GRAPH
apt (>= 1.9.0)
build-essential (>= 0.0.0)
openssl (>= 0.0.0)
rabbitmq (3.2.2)
erlang (>= 0.9.0)
rabbitmq (3.3.0)
erlang (>= 0.9)
redisio (1.7.1)
ulimit (>= 0.1.2)
rsyslog (1.12.2)
@@ -254,7 +254,7 @@ GRAPH
collectd (>= 0.0.0)
collectd-librato (>= 0.0.0)
collectd_plugins (>= 0.0.0)
rubygems-monitoring (0.0.13)
rubygems-monitoring (0.0.14)
chef-vault (>= 0.0.0)
cpan (>= 0.0.0)
dnsimple (>= 0.0.0)
@@ -278,19 +278,20 @@ GRAPH
nginx (>= 0.0.0)
rubygems (>= 0.0.0)
rubygems-ruby (0.0.3)
rubygems-sensu (0.0.100)
rubygems-sensu (0.1.1)
build-essential (>= 0.0.0)
chef-vault (>= 0.0.0)
cpan (>= 0.0.0)
sensu (= 1.0.0)
sensu (= 2.1.0)
uchiwa (>= 0.0.0)
rubygems-ssh (0.0.5)
openssh (>= 0.0.0)
rubygems-utility (0.0.8)
apt (>= 0.0.0)
runit (1.4.6)
build-essential (>= 0.0.0)
yum (< 3.0.0)
sensu (1.0.0)
sensu (2.1.0)
apt (>= 0.0.0)
rabbitmq (>= 2.0.0)
redisio (>= 1.7.0)
@@ -299,6 +300,10 @@ GRAPH
sudo (2.7.0)
sysctl (0.6.0)
ohai (>= 0.0.0)
uchiwa (0.5.0)
apt (>= 0.0.0)
nodejs (>= 0.0.0)
yum (>= 0.0.0)
ulimit (0.3.2)
unicorn (2.0.0)
user (0.3.0)
2 changes: 1 addition & 1 deletion cookbooks/rubygems-monitoring/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name 'rubygems-monitoring'
maintainer 'RubyGems.org ops team'

version '0.0.13'
version '0.0.14'

depends 'chef-vault'
depends 'cpan'
Original file line number Diff line number Diff line change
@@ -13,22 +13,25 @@ server {
ssl on;
ssl_certificate <%= @ssl_cert %>;
ssl_certificate_key <%= @ssl_key %>;
ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS";
ssl_protocols TLSv1.1 TLSv1.2;
ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK';
ssl_prefer_server_ciphers on;
ssl_session_cache shared:SSL:10m;
ssl_session_timeout 5m;

add_header Strict-Transport-Security max-age=31536000;

proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Content-Length $content_length;
proxy_set_header Host $host;
proxy_redirect off;

location / {
proxy_pass http://localhost:8080;
proxy_pass http://localhost:3000;
}

}
5 changes: 3 additions & 2 deletions cookbooks/rubygems-sensu/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name 'rubygems-sensu'
maintainer 'RubyGems.org ops team'

version '0.0.100'
version '0.1.1'

depends 'build-essential'
depends 'chef-vault'
depends 'cpan'
depends 'sensu', '1.0.0'
depends 'sensu', '2.1.0'
depends 'uchiwa'

supports 'ubuntu'
5 changes: 1 addition & 4 deletions cookbooks/rubygems-sensu/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -3,8 +3,7 @@
# Recipe:: default
#

# change this once we have the vault setup
node.default['sensu']['use_ssl'] = false
node.default['sensu']['version'] = '0.14.0-1'

include_recipe 'sensu'

@@ -18,9 +17,7 @@

node.default['sensu']['api']['host'] = address
node.default['sensu']['rabbitmq']['host'] = address
node.default['sensu']['rabbitmq']['port'] = 5672
node.default['sensu']['redis']['host'] = address
node.default['sensu']['redis']['port'] = 6379

sensu_client node.name do
address node['ipaddress']
9 changes: 4 additions & 5 deletions cookbooks/rubygems-sensu/recipes/server.rb
Original file line number Diff line number Diff line change
@@ -7,10 +7,9 @@

sensu_creds = chef_vault_item('sensu', 'credentials')

node.default['sensu']['use_ssl'] = false
node.default['sensu']['dashboard']['bind'] = '0.0.0.0'
node.default['sensu']['dashboard']['user'] = sensu_creds['user']
node.default['sensu']['dashboard']['password'] = sensu_creds['password']
node.default['uchiwa']['version'] = '0.2.6-1'
node.default['sensu']['uchiwa']['user'] = sensu_creds['user']
node.default['sensu']['uchiwa']['pass'] = sensu_creds['password']
node.default['sensu']['use_embedded_ruby'] = true

sensu_handler 'default' do
@@ -32,7 +31,7 @@
include_recipe 'sensu::redis'
include_recipe 'sensu::server_service'
include_recipe 'sensu::api_service'
include_recipe 'sensu::dashboard_service'
include_recipe 'uchiwa'

include_recipe 'rubygems-sensu::app'
include_recipe 'rubygems-sensu::balancer'
4 changes: 2 additions & 2 deletions environments/common.json
Original file line number Diff line number Diff line change
@@ -19,13 +19,13 @@
"rubygems-hosts": "= 0.0.8",
"rubygems-logging": "= 0.0.6",
"rubygems-metrics": "= 0.0.8",
"rubygems-monitoring": "= 0.0.13",
"rubygems-monitoring": "= 0.0.14",
"rubygems-motd": "= 0.0.9",
"rubygems-ntp": "= 0.0.3",
"rubygems-people": "= 0.0.29",
"rubygems-redis": "= 0.0.5",
"rubygems-repo": "= 0.0.26",
"rubygems-sensu": "= 0.0.100",
"rubygems-sensu": "= 0.1.1",
"rubygems-ssh": "= 0.0.5",
"rubygems-utility": "= 0.0.8",
"dnsimple": "= 0.5.5"
4 changes: 2 additions & 2 deletions environments/production.json
Original file line number Diff line number Diff line change
@@ -19,13 +19,13 @@
"rubygems-hosts": "= 0.0.8",
"rubygems-logging": "= 0.0.6",
"rubygems-metrics": "= 0.0.8",
"rubygems-monitoring": "= 0.0.13",
"rubygems-monitoring": "= 0.0.14",
"rubygems-motd": "= 0.0.9",
"rubygems-ntp": "= 0.0.3",
"rubygems-people": "= 0.0.29",
"rubygems-redis": "= 0.0.5",
"rubygems-repo": "= 0.0.26",
"rubygems-sensu": "= 0.0.100",
"rubygems-sensu": "= 0.1.1",
"rubygems-ssh": "= 0.0.5",
"rubygems-utility": "= 0.0.8",
"dnsimple": "= 0.5.5"
4 changes: 2 additions & 2 deletions environments/staging.json
Original file line number Diff line number Diff line change
@@ -19,13 +19,13 @@
"rubygems-hosts": "= 0.0.8",
"rubygems-logging": "= 0.0.6",
"rubygems-metrics": "= 0.0.8",
"rubygems-monitoring": "= 0.0.13",
"rubygems-monitoring": "= 0.0.14",
"rubygems-motd": "= 0.0.9",
"rubygems-ntp": "= 0.0.3",
"rubygems-people": "= 0.0.29",
"rubygems-redis": "= 0.0.5",
"rubygems-repo": "= 0.0.26",
"rubygems-sensu": "= 0.0.100",
"rubygems-sensu": "= 0.1.1",
"rubygems-ssh": "= 0.0.5",
"rubygems-utility": "= 0.0.8",
"dnsimple": "= 0.5.5"