Merge pull request #59 from opentable/opentable

Update sensu apt repo.
Yelp · Dec 2, 2015 · 6433469 · 6433469
2 parents e3dc4fc + f8469ed
commit 6433469
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -44,7 +44,7 @@
 #
 #  [*repo_key_source*]
 #    String
-#    Default: http://repos.sensuapp.org/apt/pubkey.gpg
+#    Default: http://repositories.sensuapp.org/apt/pubkey.gpg
 #    GPG key for the repo we're installing
 #
 #  [*manage_services*]

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -23,7 +23,7 @@
   $repo            = 'main'
   $repo_source     = undef
   $repo_key_id     = '8911D8FF37778F24B4E726A218609E3D7580C77F'
-  $repo_key_source = 'http://repos.sensuapp.org/apt/pubkey.gpg'
+  $repo_key_source = 'http://repositories.sensuapp.org/apt/pubkey.gpg'
   $manage_services = true
   $manage_user     = true
 

diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp
@@ -19,7 +19,7 @@
       if $uchiwa::repo_source {
         $url = $uchiwa::repo_source
       } else {
-        $url = 'http://repos.sensuapp.org/apt'
+        $url = 'http://repositories.sensuapp.org/apt'
       }
 
       apt::source { 'sensu':

diff --git a/spec/classes/uchiwa_spec.rb b/spec/classes/uchiwa_spec.rb
@@ -53,11 +53,11 @@
           context 'default' do
             it { should contain_apt__source('sensu').with(
               :ensure   => 'present',
-              :location => 'http://repos.sensuapp.org/apt',
+              :location => 'http://repositories.sensuapp.org/apt',
               :release  => 'sensu',
               :repos    => 'main',
               :include  => { 'src' => false, 'deb' => true },
-              :key      => { 'id' => '8911D8FF37778F24B4E726A218609E3D7580C77F', 'source' => 'http://repos.sensuapp.org/apt/pubkey.gpg' },
+              :key      => { 'id' => '8911D8FF37778F24B4E726A218609E3D7580C77F', 'source' => 'http://repositories.sensuapp.org/apt/pubkey.gpg' },
               :before   => 'Package[uchiwa]'
             ) }
           end
@@ -93,7 +93,7 @@
 
             it { should_not contain_apt__key('sensu').with(
               :key         => '7580C77F',
-              :key_source  => 'http://repos.sensuapp.org/apt/pubkey.gpg'
+              :key_source  => 'http://repositories.sensuapp.org/apt/pubkey.gpg'
             ) }
 
             it { should contain_package('uchiwa').with(