Add a bootstrap mode for rubygems-apt for using the default repos

rubygems · Jul 3, 2014 · 43d68ea · 43d68ea
1 parent b681f81
commit 43d68ea
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -178,7 +178,7 @@ GRAPH
   redisio (1.7.1)
     ulimit (>= 0.1.2)
   rsyslog (1.12.2)
-  rubygems (0.0.16)
+  rubygems (0.0.17)
     rubygems-apt (>= 0.0.0)
     rubygems-chef (>= 0.0.0)
     rubygems-cloud-init (>= 0.0.0)
@@ -204,7 +204,7 @@ GRAPH
     runit (>= 0.0.0)
     unicorn (>= 0.0.0)
     user (>= 0.0.0)
-  rubygems-apt (0.0.5)
+  rubygems-apt (0.0.8)
     apt (>= 0.0.0)
   rubygems-backups (0.0.14)
     chef-vault (>= 0.0.0)

diff --git a/cookbooks/rubygems-apt/metadata.rb b/cookbooks/rubygems-apt/metadata.rb
@@ -1,7 +1,7 @@
 name 'rubygems-apt'
 maintainer 'RubyGems.org ops team'
 
-version '0.0.5'
+version '0.0.8'
 
 depends 'apt'
 

diff --git a/cookbooks/rubygems-apt/recipes/default.rb b/cookbooks/rubygems-apt/recipes/default.rb
@@ -1,6 +1,9 @@
+node.default['apt']['bootstrap'] = true
+
 # We use /etc/apt/sources.list.d/ for everything.
 file '/etc/apt/sources.list' do
   action :delete
+  not_if { node['apt']['bootstrap'] }
 end
 
 file '/etc/apt/apt.conf.d/05unauthenticated' do
@@ -24,4 +27,5 @@
   uri 'http://repo01.common.rubygems.org'
   distribution node['lsb']['codename']
   components ['main']
+  not_if { node['apt']['bootstrap'] }
 end
diff --git a/cookbooks/rubygems/metadata.rb b/cookbooks/rubygems/metadata.rb
@@ -2,7 +2,7 @@
 maintainer       'RubyGems.org Ops Team'
 license          'MIT'
 description      'RubyGems base recipes'
-version          '0.0.16'
+version          '0.0.17'
 
 depends 'rubygems-apt'
 depends 'rubygems-chef'