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: 282aa928f09e
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: d117137be59f
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Jun 25, 2014

  1. http to https redirects for monitoring and ci

    Sam Kottler committed Jun 25, 2014
    Copy the full SHA
    78b9ace View commit details
  2. Merge branch 'master' of github.com:rubygems/rubygems-infrastructure

    * 'master' of github.com:rubygems/rubygems-infrastructure:
      build deploy user keys from users with deploy permissions
    Sam Kottler committed Jun 25, 2014
    Copy the full SHA
    d117137 View commit details
4 changes: 2 additions & 2 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -202,7 +202,7 @@ GRAPH
rubygems-chef (0.0.8)
chef-client (>= 0.0.0)
omnibus_updater (>= 0.0.0)
rubygems-ci (0.0.6)
rubygems-ci (0.0.7)
jenkins (>= 0.0.0)
nginx (>= 0.0.0)
rubygems (>= 0.0.0)
@@ -224,7 +224,7 @@ GRAPH
collectd (>= 0.0.0)
collectd-librato (>= 0.0.0)
collectd_plugins (>= 0.0.0)
rubygems-monitoring (0.0.7)
rubygems-monitoring (0.0.8)
chef-vault (>= 0.0.0)
nginx (>= 0.0.0)
rubygems (>= 0.0.0)
2 changes: 1 addition & 1 deletion cookbooks/rubygems-ci/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name 'rubygems-ci'
maintainer 'RubyGems.org ops team'

version '0.0.6'
version '0.0.7'

depends 'jenkins'
depends 'nginx'
6 changes: 6 additions & 0 deletions cookbooks/rubygems-ci/templates/default/nginx.conf.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
server {
listen 80;
server_name ci.rubygems.org
rewrite ^ https://$server_name$request_uri? permanent;
}

server {

listen 443 default ssl;
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.7'
version '0.0.8'

depends 'chef-vault'
depends 'nginx'
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
server {
listen 80;
server_name monitoring.rubygems.org
rewrite ^ https://$server_name$request_uri? permanent;
}

server {

listen 443 default ssl;