From 717c612ba7143bcadb0402a852d82d849aad6c73 Mon Sep 17 00:00:00 2001
From: Greg Szabo <greg@philosobear.com>
Date: Wed, 6 Sep 2017 21:39:57 -0400
Subject: [PATCH] Debian/RedHat repo fixes, added greg money to public_testnet

---
 ansible/app_options_files/public_testnet | 20 ++++++++++++--------
 ansible/roles/install/tasks/centos.yml   | 12 ++++++------
 ansible/roles/install/tasks/debian.yml   |  8 ++++----
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/ansible/app_options_files/public_testnet b/ansible/app_options_files/public_testnet
index 2c30fde67..687532b8e 100644
--- a/ansible/app_options_files/public_testnet
+++ b/ansible/app_options_files/public_testnet
@@ -94,20 +94,24 @@
         ]
       },
       {
-        "name": "phomer",
-        "address": "BAA67E0346AF48A05330149A3A72D9B974E9EBD2",
-        "pub_key": {
+        "name": "gregkey",
+        "address": "B01C264BFE9CBD45458256E613A6F07061A3A6B6",
+        "pubkey": {
           "type": "ed25519",
-          "data": "F5DF27FD625800D971A9E9B2607F0052480E49A12BE85E17336F773FE6FB9BC9"
-        },
+          "data": "E1FFBD187FA2A922CE1B367532CEAC1AD8E606D576AB0D2E2CAA7EC6B7DAC10F"
+        },        "address": "0767FF644453E38FBDB16A238D383AC8EFA87518",
         "coins": [
           {
-            "denom": "antipho",
-            "amount": 33
+            "denom": "mycoin",
+            "amount": 3478765434568
           },
           {
-            "denom": "pho",
+            "denom": "buckyball",
             "amount": 8367251830291
+          },
+          {
+            "denom": "playmoney",
+            "amount": 9999999999999
           }
         ]
       },
diff --git a/ansible/roles/install/tasks/centos.yml b/ansible/roles/install/tasks/centos.yml
index 6829a67b1..b6396d7d4 100644
--- a/ansible/roles/install/tasks/centos.yml
+++ b/ansible/roles/install/tasks/centos.yml
@@ -1,19 +1,19 @@
 ---
 
 #Three commands to install a service on CentOS/RedHat
-#wget -O - https://do9rmxapsag1v.cloudfront.net/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint | rpm --import -
-#wget -O /etc/yum.repos.d/tendermint.repo https://do9rmxapsag1v.cloudfront.net/centos/7/os/x86_64/tendermint.repo
+#wget -O - https://tendermint-packages.interblock.io/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint | rpm --import -
+#wget -O /etc/yum.repos.d/tendermint.repo https://tendermint-packages.interblock.io/centos/7/os/x86_64/tendermint.repo
 #yum update && yum install basecoin
 
 #This has a bug in Ansible 2.3: https://github.com/ansible/ansible/issues/20711
 #- name: Add repository key on CentOS/RedHat
 #  when: ansible_os_family == "RedHat"
-#  rpm_key: key=https://do9rmxapsag1v.cloudfront.net/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint
+#  rpm_key: key=https://tendermint-packages.interblock.io/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint
 
 #Workaround
 - name: Download repository key for CentOS/RedHat
   when: ansible_os_family == "RedHat"
-  get_url: "url=https://do9rmxapsag1v.cloudfront.net/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint dest=/root/RPM-GPG-KEY-Tendermint force=yes checksum=sha256:a8c61d4061697d2595562c703dbafbdfdcfa7f0c75a523ac84d5609d1b444abe"
+  get_url: "url=https://tendermint-packages.interblock.io/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint dest=/root/RPM-GPG-KEY-Tendermint force=yes checksum=sha256:a8c61d4061697d2595562c703dbafbdfdcfa7f0c75a523ac84d5609d1b444abe"
 - name: Import repository key for CentOS/RedHat
   when: ansible_os_family == "RedHat"
   command: "rpm --import /root/RPM-GPG-KEY-Tendermint"
@@ -22,10 +22,10 @@
   when: ansible_os_family == "RedHat"
   yum_repository:
     name: tendermint
-    baseurl: https://do9rmxapsag1v.cloudfront.net/centos/7/os/x86_64
+    baseurl: https://tendermint-packages.interblock.io/centos/7/os/x86_64
     description: "Tendermint repo"
     gpgcheck: yes
-    gpgkey: https://do9rmxapsag1v.cloudfront.net/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint
+    gpgkey: https://tendermint-packages.interblock.io/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint
 #    repo_gpgcheck: yes
 
 - name: Install package on CentOS/RedHat
diff --git a/ansible/roles/install/tasks/debian.yml b/ansible/roles/install/tasks/debian.yml
index 8c822f53c..8b955659f 100644
--- a/ansible/roles/install/tasks/debian.yml
+++ b/ansible/roles/install/tasks/debian.yml
@@ -1,20 +1,20 @@
 ---
 
 #Three commands to install a service on Debian/Ubuntu
-#wget -O - https://do9rmxapsag1v.cloudfront.net/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint | apt-key add -
-#wget -O /etc/apt/sources.list.d/tendermint.list https://do9rmxapsag1v.cloudfront.net/debian/tendermint.list
+#wget -O - https://tendermint-packages.interblock.io/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint | apt-key add -
+#wget -O /etc/apt/sources.list.d/tendermint.list https://tendermint-packages.interblock.io/debian/tendermint.list
 #apt-get update && apt-get install basecoin
 
 - name: Add repository key on Debian/Ubuntu
   when: ansible_os_family == "Debian"
   apt_key:
-    url: https://do9rmxapsag1v.cloudfront.net/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint
+    url: https://tendermint-packages.interblock.io/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint
     id: 2122CBE9
 
 - name: Install tendermint repository on Debian/Ubuntu
   when: ansible_os_family == "Debian"
   apt_repository:
-    repo: deb https://do9rmxapsag1v.cloudfront.net/debian stable main
+    repo: deb https://tendermint-packages.interblock.io/debian stable main
 
 - name: Install package on Debian/Ubuntu
   when: ansible_os_family == "Debian"