Fix amazon linux support

[delivers #110647510]
conjur-cookbooks · Dec 23, 2015 · 2c1c262 · 2c1c262
1 parent f75ca4a
commit 2c1c262
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.3.1
+
+* Fix Amazon Linux support
+
 # 0.3.0
 
 * Systemd support

diff --git a/metadata.rb b/metadata.rb
@@ -3,14 +3,14 @@
 maintainer_email 'support@conjur.net'
 license          'MIT License'
 description      'Installs/Configures conjur'
-version          '0.3.0'
+version          '0.3.1'
 
 recipe "conjur::install", "Installs Conjur base packages and configuration, suitable for a foundation image."
 
 depends "apt"
 depends "yum"
 depends "sshd-service"
 
-%w(ubuntu centos).each do |platform|
+%w(ubuntu centos amazon).each do |platform|
   supports platform
 end
diff --git a/recipes/_install_ssh_rhel.rb b/recipes/_install_ssh_rhel.rb
@@ -14,9 +14,16 @@
   source 'apt.key'
 end
 
+# amazon linux uses 'current' as $releasever
+# but packages from EL7 work on it.
+# CentOS and RHEL actually have '6' or '7' in the variable.
+releasever = {
+  'amazon' => '7'
+}[node.platform] || '$releasever'
+
 yum_repository 'conjur' do
   description 'Conjur Inc.'
-  baseurl 'https://s3.amazonaws.com/yum.conjur/el/$releasever'
+  baseurl "https://s3.amazonaws.com/yum.conjur/el/#{releasever}"
   gpgkey 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Conjur'
 end