fix(setup): fix fullstaq key url (#247)

* Fix fullstaq key url the url to the fullstaq key is wrong and it throws an 404 during setup run .. the right one is https://raw.githubusercontent.com/fullstaq-labs/fullstaq-ruby-server-edition/main/fullstaq-ruby.asc
ajgon · Oct 17, 2020 · 62ced10 · 62ced10
1 parent f89eb49
commit 62ced10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/recipes/setup.rb b/recipes/setup.rb
@@ -82,7 +82,7 @@
 
     # For whatever reason `apt_repository.key` doesn't work here.
     remote_file "#{Chef::Config[:file_cache_path]}/fullstaq-ruby.asc" do
-      source 'https://raw.githubusercontent.com/fullstaq-labs/fullstaq-ruby-server-edition/master/fullstaq-ruby.asc'
+      source 'https://raw.githubusercontent.com/fullstaq-labs/fullstaq-ruby-server-edition/main/fullstaq-ruby.asc'
     end
 
     execute 'add fullstaq repository key' do
@@ -101,7 +101,7 @@
       baseurl 'https://yum.fullstaqruby.org/centos-7/$basearch'
       enabled true
       gpgcheck false
-      gpgkey 'https://raw.githubusercontent.com/fullstaq-labs/fullstaq-ruby-server-edition/master/fullstaq-ruby.asc'
+      gpgkey 'https://raw.githubusercontent.com/fullstaq-labs/fullstaq-ruby-server-edition/main/fullstaq-ruby.asc'
       repo_gpgcheck true
       sslverify true
       only_if { node['ruby-provider'] == 'fullstaq' }

diff --git a/spec/unit/recipes/setup_spec.rb b/spec/unit/recipes/setup_spec.rb
@@ -173,7 +173,7 @@
       end
 
       it 'adds fullstaq apt repository' do
-        keyurl = 'https://raw.githubusercontent.com/fullstaq-labs/fullstaq-ruby-server-edition/master/fullstaq-ruby.asc'
+        keyurl = 'https://raw.githubusercontent.com/fullstaq-labs/fullstaq-ruby-server-edition/main/fullstaq-ruby.asc'
 
         expect(chef_run).to add_apt_repository('fullstaq-ruby').with(
           uri: 'https://apt.fullstaqruby.org',
@@ -244,7 +244,7 @@
           baseurl: 'https://yum.fullstaqruby.org/centos-7/$basearch',
           enabled: true,
           gpgcheck: false,
-          gpgkey: 'https://raw.githubusercontent.com/fullstaq-labs/fullstaq-ruby-server-edition/master/fullstaq-ruby.asc',
+          gpgkey: 'https://raw.githubusercontent.com/fullstaq-labs/fullstaq-ruby-server-edition/main/fullstaq-ruby.asc',
           repo_gpgcheck: true,
           sslverify: true
         )