From 2397ed5abd7b27de765c585a9060553025db59ea Mon Sep 17 00:00:00 2001
From: natlg <natalia.gulko@yahoo.com>
Date: Thu, 13 Dec 2018 00:54:32 -0800
Subject: [PATCH] Update BlockScout version, remove default db_user_password

---
 group_vars/all.yml.example         |  4 ++--
 group_vars/blockscout.yml.example  |  5 +++--
 roles/blockscout/defaults/main.yml |  4 ++--
 roles/blockscout/tasks/main.yml    | 15 +++++++--------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/group_vars/all.yml.example b/group_vars/all.yml.example
index 56296f2..042065e 100644
--- a/group_vars/all.yml.example
+++ b/group_vars/all.yml.example
@@ -126,7 +126,7 @@ validator_archive: "off"
 configure_extended_tcp_settings: false
 #Setup extended nginx headers. Used in bootnode, explorer and netstat roles.
 nginx_headers: "on"
-#Setup which proxy port should be used in nginx. Used in bootnode, explorer and netstat roles. 
+#Setup which proxy port should be used in nginx. Used in bootnode, explorer, blockscout and netstat roles.
 PROXY_PORT: "8545"
 
 
@@ -179,7 +179,7 @@ api_version: "9773b5b"
 ##Blockscout-related variables
 
 #Explicitly specified api version to use
-blockscout_version: "df6ec81b68"
+blockscout_version: "44e4f17d14"
 #Name of database user to create
 db_user: "INSERT HERE"
 #Password for the database user
diff --git a/group_vars/blockscout.yml.example b/group_vars/blockscout.yml.example
index f847636..654c58f 100644
--- a/group_vars/blockscout.yml.example
+++ b/group_vars/blockscout.yml.example
@@ -6,9 +6,10 @@ home: "/home/{{ username }}"
 install_debug_tools: "no"
 reboot_after_completion: false
 
-blockscout_version: "df6ec81b68"
+blockscout_version: "44e4f17d14"
 db_user: "blockscout"
-db_user_password: "dvYYTbhdhuuOLMf74ghu"
+db_user_password: ""
+PROXY_PORT: "4000"
 
 allow_blockscout_ssh: true
 allow_blockscout_p2p: true
diff --git a/roles/blockscout/defaults/main.yml b/roles/blockscout/defaults/main.yml
index b13c6d6..5de48ba 100644
--- a/roles/blockscout/defaults/main.yml
+++ b/roles/blockscout/defaults/main.yml
@@ -18,7 +18,7 @@ reboot_after_completion: false
 install_debug_tools: "no"
 install_firewall: false
 
-blockscout_version: "df6ec81b68"
+blockscout_version: "44e4f17d14"
 db_user: "blockscout"
-db_user_password: "dvYYTbhdhuuOLMf74ghu"
+db_user_password: ""
 PROXY_PORT: "4000"
\ No newline at end of file
diff --git a/roles/blockscout/tasks/main.yml b/roles/blockscout/tasks/main.yml
index 3395673..eaffd32 100644
--- a/roles/blockscout/tasks/main.yml
+++ b/roles/blockscout/tasks/main.yml
@@ -23,21 +23,20 @@
     group: '{{ username }}'
     mode: 0644
 
-- name: Replace Parity url
+- name: Update JSON RPC Variant
   replace:
-    path: "{{ item.path }}"
-    regexp: "{{ item.regexp1 }}"
-    replace: "{{ item.replace }}"
+    path: '{{ item }}'
+    regexp: 'ganache'
+    replace: "parity"
   with_items:
-  - { path: '{{ home }}/blockscout/apps/explorer/config/dev/parity.exs', regexp1: 'https.*network', replace: 'http://localhost:8545'}
-  - { path: '{{ home }}/blockscout/apps/explorer/config/dev/parity.exs', regexp1: 'wss.*ws', replace: 'ws://localhost:8546'}
-  - { path: '{{ home }}/blockscout/apps/indexer/config/dev/parity.exs', regexp1: 'https.*network', replace: 'http://localhost:8545'}
-  - { path: '{{ home }}/blockscout/apps/indexer/config/dev/parity.exs', regexp1: 'wss.*ws', replace: 'ws://localhost:8546'}
+  - "{{ home }}/blockscout/apps/explorer/config/dev.exs"
+  - "{{ home }}/blockscout/apps/indexer/config/dev.exs"
 
 - name: Install dependencies
   shell: cd {{ home }}/blockscout && mix local.hex --force && mix do deps.get, local.rebar --force, deps.compile, compile
 
 - name: Create user
+  become: true
   become_user: postgres
   postgresql_user:
     name: '{{ db_user }}'