Cleanup rubygems-repo and rubygems-apt

rubygems · Jul 7, 2014 · 6886d52 · 6886d52
1 parent ab5cbdb
commit 6886d52
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 33 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -205,7 +205,7 @@ GRAPH
     runit (>= 0.0.0)
     unicorn (>= 0.0.0)
     user (>= 0.0.0)
-  rubygems-apt (0.0.9)
+  rubygems-apt (0.0.11)
     apt (>= 0.0.0)
   rubygems-backups (0.0.14)
     chef-vault (>= 0.0.0)
@@ -271,7 +271,7 @@ GRAPH
     redisio (>= 0.0.0)
     rubygems (>= 0.0.0)
     rubygems-backups (>= 0.0.0)
-  rubygems-repo (0.0.19)
+  rubygems-repo (0.0.21)
     aptly (>= 0.0.0)
     nginx (>= 0.0.0)
     rubygems (>= 0.0.0)

diff --git a/cookbooks/rubygems-apt/files/default/packages.key b/cookbooks/rubygems-apt/files/default/packages.key
@@ -1,31 +1,30 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1
 
-mQENBFOyXsgBCADWXL9pyJRrA9Gv/wM13Vd6dEhpMTC2qDsS29J0Iv1OjotZJe1t
-bVklAIbXfwhZ2osoVZoDqMiOGOqaLdLv4jTGNk/KjjdEqZqnQ7MfSD9CCwT1fqo+
-dqAqxOCCImc+yfRT8KE71AvZsx+saJXToQ50ub0ksetdpba+C7MssEFpkFCCNF3X
-e5vxhhEYI7vDPUN3Y4m6h4tJYjA4Q1lhUq03zU+f8M6EbfYs3m5jrd+/oAdbiLkG
-4VTOs0HIvuQyMqFJBJzG9Ckl996OJgeljYmrfV7UlGH8LaLp1USHOYV0/v8jGpVc
-D8pK1v1DXxjAwT2wlB+dAuTPkxlBXZwELeM1ABEBAAG0LVJ1YnlHZW1zLm9yZyBP
-cHMgVGVhbSA8cGFja2FnZXNAcnVieWdlbXMub3JnPokBPgQTAQIAKAUCU7JeyAIb
-AwUJCWYBgAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQgHdAnWBkvs36KAf/
-coEmQmocmhNDIUbvs7yEFuF5o11mOgrg8HGz2PbPtVpCnCUbWZBz3edYkIDVXhNB
-eyZrkcjs+MHpTd/+fu7lbDU9W/dW9vDCqZX0hKeJi/4c1X75mkE8iXsrJpxgIW5o
-cx8/hmZmgRisAPtdAYfUxoOKt0ElmQvnVrKMvCvwkk35ODb4+VDsHoj6vF4Vln9/
-o6epxPkY4c1WdYH4GzUuBNWufpy1J64Of3fg58x0JnOXhj3p82Z+YIKiT+hvoCL2
-csk5r5FH2HebXFRc9mhkGNHtCazV6Oma3yBs4XxQx5dpJRocYg/EZjPx2Df1Zoys
-KyW5ohwj9+wiecO97ZInarkBDQRTsl7IAQgAlV56gI5SbKrDW+fDSXXu087jaknt
-XJcKm+i+xumpZy3s/R1zO8Q6CN/RKLc+SDiZ/7P2qTH2zuNoaoZTlWpXjAw/w8eZ
-4E12ID9WqpuczILkJ1m1ghYUQ0GbTb8pVL5Bnxsn4jCm4oqvMsf84DSiVfMeRbkG
-ccmAsICIeV2kdOOOscoR531n25azV1qk1H3jxAgSgbO6KMlp9aQ+hS/srTilH0BW
-A86eMtTGCVMoBEaxMWtGebRwVnhh9MxiLy3s1bm6cAnSuBIIJM0lVwIzLrHzRMJN
-XMJH3CQkUN5UGkugvv5YV+ejwi00nrSc8Pb+sAA1BDNExptJUOwl1REldQARAQAB
-iQElBBgBAgAPBQJTsl7IAhsMBQkJZgGAAAoJEIB3QJ1gZL7NKMkIAJlw2f9nk8Rg
-2/fZi2xeJKbwaVdNrqGLwY65CYC0CJP83UKQXoBhkePKRb2Q6GNYU5Okhkw4LCzd
-6QNrken/0CuJpVFH5XBCBo/nA//GxEW8tMIOBz4lpM5MPXP9BDeFkxZt5ZlFKHg9
-b3aV86rJUAefBj1o4MdRxY2+6hkCmUP8ZQydecXcpxZTd16XtWJETwH3p2Smids+
-gzZTqTW30cgLiKRwcxDmZQhD+CVUUl6hrzlhhrbIv+CWoTaMRmmcKgnoJuXcoqg4
-dG1GghGZcfJWDgTpWRBGBcvIxhTDHM/hfgiZWKeHhPOI3jayvOtb7hmKxOuiRypF
-db4eUZ9TvRY=
-=rEZ+
+mQENBFO5yWQBCAC+32YfHKLqjMaIvEdecb8xEtgWTYgjxzvbY/0yuCmuIo5NqH2o
+8q8ViPCbP6pDmwPTWuQMIDeVbBIhycclwqhST2VQrnhScXwAj0JkeUo3Z6oCh8b4
+9PKJG67ptCrsnV8SPMsEPycVmvB+acTGgsDQLl4euc5RiLDTjnEOXgeDYRXC1SGS
+vXiomEhKvc5mKG/CfUa34WwdD2fxeUQyfr95IA+0zv9rnJuXhk6lLbLR0n+wX9Qf
+B/pROcUqTKpsJgWZ95zuNm6PELwnyLru9RKN/wmZIA+hZQ+8IO0YDLWKOD/O5POz
+3Uz26W7axBBnOans+5b+ghiwD2YYp/DKEWPBABEBAAG0LVJ1YnlHZW1zLm9yZyBw
+YWNrYWdlcyA8cGFja2FnZXNAcnVieWdlbXMub3JnPokBOAQTAQIAIgUCU7nJZAIb
+AwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQTANX9GtqvZc61ggAuu0pzr2h
+TmzIzvUOrIsO/vpIZJKBnclkSlSBkdKX9E0vMH/SlJ8T7TVRyzQLucDBxsKdJbPN
+X61t0DUuPEZFuVE+PEpgrrOXryj/Q1BENDgkaSxoEm5tXaG7jWoRomfvAqiday2B
+KiA79cLHUhIOrfeLOEl6v3Wn5NpomLmKI9WRtLS2tel7Oq1Uk/fP7enInlNxXeBg
+rquwjZ7jufNimCfcinjbv6I1rIDBF0kTuvcFatkbyEYXQQ6CFTuS05b+N9l0h16+
+TcBAmNsc9j35ir/GWO0PdhamFuBqArPDY2suZISQlgtDmUU/oboV9w+Alp2O8TLK
+GwN02c4C75ujW7kBDQRTuclkAQgAuV6eBPVyR8yl/O+WytBkJTYWdhslQokfclOT
+GjtRcFLSCWM9xUjwLcP9dopX56CFo53ErSzV77txGORznsjzrSqKZLLogGaO0Ko3
+EbUlEUf7BU/WsPp8gSrjC1s79HDOTwf6ddKae/hFJ+gb29WmUXCsTgf8ckIZ9rn2
+Qe2BiZupR6GnuE9RLYY9HQmEc783vOvMbxwdwNXlcDmkU14xyMhGM8QzGHkDr/E7
+Mr4hTUUV9cSdAvazOpHizJxz0aEtu3lqX5K0yDEKGWo1+pnCVAkV3E82Dds09a+l
+r8F3IMNctxkG7WzlkQkZwLWp5IWmHjKIAMvUapcP8z6thj+3jQARAQABiQEfBBgB
+AgAJBQJTuclkAhsMAAoJEEwDV/Rrar2XPHYH/RDrt9AmB/QrG4RRvS67ZM1bAXt1
+1WjcwUqmPk7d/XiW6VTVZqIoYIeg+t94ZH6AfzeVLED5F0YXqZ+EF7mKUaeVokjW
+N4+CVTs4kS0ND3KcuEp342HY53sE+IFh72fMtGaat2c5TX77A1iq7sCJz4CrCkRW
+M/qgfjKuBCUV/WPOh/wuKSSHOtZmMbX+AUpquy0hErvm2sqtwd2dYwcvUsvJLquD
+DpqydFkO73RD2b6DuJDsh/kxQXykzHxZDRi2sFjxA8PgVF+s9cxfXWxoylu8dOen
+kdlJkoS4PBnvLm2bz2nR/DJP5CGOgNzHIeyxNDqTkJIg6zgGJ5MDBCE3PZ8=
+=K6eW
 -----END PGP PUBLIC KEY BLOCK-----
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.9'
+version '0.0.11'
 
 depends 'apt'
 

diff --git a/cookbooks/rubygems-apt/recipes/default.rb b/cookbooks/rubygems-apt/recipes/default.rb
@@ -20,7 +20,7 @@
 
 execute 'import-rubygems-apt-key' do
   command '/usr/bin/apt-key add /etc/apt/rubygems/packages.key'
-  not_if "/usr/bin/apt-key list | grep '2048R/6064BECD'"
+  not_if "/usr/bin/apt-key list | grep '2048R/6B6ABD97'"
 end
 
 apt_repository 'rubygems_main' do

diff --git a/cookbooks/rubygems-repo/metadata.rb b/cookbooks/rubygems-repo/metadata.rb
@@ -1,7 +1,7 @@
 name 'rubygems-repo'
 maintainer 'RubyGems.org ops team'
 
-version '0.0.19'
+version '0.0.21'
 
 depends 'aptly'
 depends 'nginx'

diff --git a/cookbooks/rubygems-repo/recipes/default.rb b/cookbooks/rubygems-repo/recipes/default.rb
@@ -18,7 +18,6 @@
 end
 
 include_recipe 'aptly'
-include_recipe 'nginx'
 
 aptly_mirror 'ubuntu-trusty-main' do
   action :create
@@ -62,3 +61,10 @@
   component 'main'
   uri 'http://repos.sensuapp.org/apt'
 end
+
+include_recipe 'nginx'
+include_recipe 'rubygems-repo::nginx'
+
+link "#{node['aptly']['rootdir']}/public/packages.key" do
+  to '/var/apt/rubygems/packages.key'
+end