Update to use new public key location for threatstack agent

threatstack · Feb 23, 2015 · 511069b · 511069b
1 parent 1779c0e
commit 511069b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -19,7 +19,7 @@
 
   case $::osfamily {
     'RedHat', 'CentOS', 'Amazon': {
-      $gpg_key    = 'https://www.threatstack.com/RPM-GPG-KEY-THREATSTACK'
+      $gpg_key    = 'https://app.threatstack.com/RPM-GPG-KEY-THREATSTACK'
 
       if $::osfamily == 'Amazon' {
         $repo_url        = 'https://pkg.threatstack.com/Amazon'
@@ -32,7 +32,7 @@
       include threatstack::configure
     }
     'Debian': {
-      $gpg_key    = 'https://www.threatstack.com/APT-GPG-KEY-THREATSTACK'
+      $gpg_key    = 'https://app.threatstack.com/APT-GPG-KEY-THREATSTACK'
       $repo_url   = 'https://pkg.threatstack.com/Ubuntu'
 
       include threatstack::apt

diff --git a/manifests/yum.pp b/manifests/yum.pp
@@ -10,7 +10,7 @@
     enabled  => 1,
     baseurl  => $threatstack::repo_url,
     gpgcheck => 1,
-    gpgkey   => 'https://www.threatstack.com/RPM-GPG-KEY-THREATSTACK',
+    gpgkey   => $threatstack::gpg_key
   }
 
   package { $threatstack::ts_package:

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "threatstack-threatstack",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "author": "Threat Stack",
   "license": "Apache-2.0",
   "summary": "Installs the Threat Stack agent",

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
@@ -11,7 +11,7 @@
       :command => '/usr/bin/apt-get update'
     )}
     it { should contain_exec('Threat Stack GPG Import').with(
-      :command => '/usr/bin/curl https://www.threatstack.com/APT-GPG-KEY-THREATSTACK | /usr/bin/apt-key add -'
+      :command => '/usr/bin/curl https://app.threatstack.com/APT-GPG-KEY-THREATSTACK | /usr/bin/apt-key add -'
     )}
   end
 

diff --git a/spec/classes/yum_spec.rb b/spec/classes/yum_spec.rb
@@ -11,7 +11,7 @@
         :enabled   => 1,
         :baseurl   => 'https://pkg.threatstack.com/CentOS',
         :gpgcheck  => 1,
-        :gpgkey    => 'https://www.threatstack.com/RPM-GPG-KEY-THREATSTACK'
+        :gpgkey    => 'https://app.threatstack.com/RPM-GPG-KEY-THREATSTACK'
       ) }
     end
   end
@@ -25,7 +25,7 @@
         :enabled   => 1,
         :baseurl   => 'https://pkg.threatstack.com/CentOS',
         :gpgcheck  => 1,
-        :gpgkey    => 'https://www.threatstack.com/RPM-GPG-KEY-THREATSTACK'
+        :gpgkey    => 'https://app.threatstack.com/RPM-GPG-KEY-THREATSTACK'
       ) }
     end
   end
@@ -39,7 +39,7 @@
         :enabled   => 1,
         :baseurl   => 'https://pkg.threatstack.com/Amazon',
         :gpgcheck  => 1,
-        :gpgkey    => 'https://www.threatstack.com/RPM-GPG-KEY-THREATSTACK'
+        :gpgkey    => 'https://app.threatstack.com/RPM-GPG-KEY-THREATSTACK'
       ) }
     end
   end