From 9928a16e69c8d325fdb1ed988651008f97f98b79 Mon Sep 17 00:00:00 2001
From: Joni Hasanen <joni.hasanen@pieceofcode.net>
Date: Wed, 29 Oct 2014 14:32:54 +0200
Subject: [PATCH 1/4] Added task for GPG key imports. Fixes
 rvm/rvm1-ansible#14.

---
 tasks/rvm.yml | 5 +++++
 vars/main.yml | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/tasks/rvm.yml b/tasks/rvm.yml
index 566ef77..be9cddf 100644
--- a/tasks/rvm.yml
+++ b/tasks/rvm.yml
@@ -26,6 +26,11 @@
     mode: 0755
   when: not rvm_binary.stat.exists
 
+- name: Import GPG keys
+  command: 'gpg --keyserver hkp://keys.gnupg.net --recv-keys {{ rvm1_gpg_keys }}'
+  when: not rvm_binary.stat.exists
+  changed_when: False
+
 - name: Install rvm
   command: >
     {{ rvm1_temp_download_path }}/rvm-installer.sh {{ rvm1_rvm_version }}
diff --git a/vars/main.yml b/vars/main.yml
index 05bf820..ad75c6d 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -20,3 +20,5 @@ rvm1_symlink_binaries:
   - 'testrb'
 
 rvm1_symlink_to: '/usr/local/bin'
+
+rvm1_gpg_keys: 'D39DC0E3'

From 8e331da4d13835bd9dca3f3a485dac03feddf3eb Mon Sep 17 00:00:00 2001
From: Joni Hasanen <joni.hasanen@pieceofcode.net>
Date: Wed, 29 Oct 2014 15:00:29 +0200
Subject: [PATCH 2/4] Overriding default 'changed' result reporting

---
 tasks/rvm.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tasks/rvm.yml b/tasks/rvm.yml
index be9cddf..08137bb 100644
--- a/tasks/rvm.yml
+++ b/tasks/rvm.yml
@@ -28,6 +28,7 @@
 
 - name: Import GPG keys
   command: 'gpg --keyserver hkp://keys.gnupg.net --recv-keys {{ rvm1_gpg_keys }}'
+  changed_when: False
   when: not rvm_binary.stat.exists
   changed_when: False
 

From 86ee62a5252a8cee69a77c34d621e8e708292f2a Mon Sep 17 00:00:00 2001
From: Joni Hasanen <joni.hasanen@pieceofcode.net>
Date: Wed, 29 Oct 2014 15:26:05 +0200
Subject: [PATCH 3/4] Removed duplicated option

---
 tasks/rvm.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tasks/rvm.yml b/tasks/rvm.yml
index 08137bb..f97e2ca 100644
--- a/tasks/rvm.yml
+++ b/tasks/rvm.yml
@@ -30,7 +30,6 @@
   command: 'gpg --keyserver hkp://keys.gnupg.net --recv-keys {{ rvm1_gpg_keys }}'
   changed_when: False
   when: not rvm_binary.stat.exists
-  changed_when: False
 
 - name: Install rvm
   command: >

From 4a6fc61bd0b14ead4576f76c529584f21a5dc307 Mon Sep 17 00:00:00 2001
From: Joni Hasanen <joni.hasanen@pieceofcode.net>
Date: Wed, 29 Oct 2014 15:29:46 +0200
Subject: [PATCH 4/4] Made changed @nickjj suggested

---
 defaults/main.yml | 6 ++++++
 tasks/rvm.yml     | 2 +-
 vars/main.yml     | 2 --
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index c5498e1..33294f3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -23,3 +23,9 @@ rvm1_rvm_version: 'stable'
 
 # Check and update rvm, disabling this will force rvm to never update
 rvm1_rvm_check_for_updates: True
+
+# GPG key verification, use an empty string if you want to skip this
+# Note: Unless you know what you're doing, just keep it as is
+#           Identity proof: https://keybase.io/mpapis
+#           PGP message: https://rvm.io/mpapis.asc
+rvm1_gpg_keys: 'D39DC0E3'
diff --git a/tasks/rvm.yml b/tasks/rvm.yml
index f97e2ca..855748a 100644
--- a/tasks/rvm.yml
+++ b/tasks/rvm.yml
@@ -29,7 +29,7 @@
 - name: Import GPG keys
   command: 'gpg --keyserver hkp://keys.gnupg.net --recv-keys {{ rvm1_gpg_keys }}'
   changed_when: False
-  when: not rvm_binary.stat.exists
+  when: not rvm_binary.stat.exists and rvm1_gpg_keys
 
 - name: Install rvm
   command: >
diff --git a/vars/main.yml b/vars/main.yml
index ad75c6d..05bf820 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -20,5 +20,3 @@ rvm1_symlink_binaries:
   - 'testrb'
 
 rvm1_symlink_to: '/usr/local/bin'
-
-rvm1_gpg_keys: 'D39DC0E3'