From e3171c98a90a855ea8ef11df2ad3ba149837ca8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 19 May 2021 14:11:45 +0200 Subject: [PATCH] use WireGuard instead of Tinc VPN for metrics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/log-store.yml | 2 +- ansible/group_vars/nimbus-geth-goerli.yml | 2 +- ansible/group_vars/nimbus-geth-mainnet.yml | 2 +- ansible/requirements.yml | 7 +------ 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ansible/group_vars/log-store.yml b/ansible/group_vars/log-store.yml index f26838b..6dca81c 100644 --- a/ansible/group_vars/log-store.yml +++ b/ansible/group_vars/log-store.yml @@ -18,7 +18,7 @@ es_master_nodes: | | json_query( '[].{ name: hostname, - addr: ansible_local.tinc.vpn_ip, + addr: ansible_local.wireguard.vpn_ip, port: to_string(es_node_port) }') }} es_cluster_name: 'nimbus-logs-search' diff --git a/ansible/group_vars/nimbus-geth-goerli.yml b/ansible/group_vars/nimbus-geth-goerli.yml index 5453445..603b3b7 100644 --- a/ansible/group_vars/nimbus-geth-goerli.yml +++ b/ansible/group_vars/nimbus-geth-goerli.yml @@ -12,7 +12,7 @@ geth_log_level_name: info geth_websocket_enabled: true # Geth auth geth_account_pass: '{{lookup("passwordstore", "services/Nimbus-Geth/password")}}' -# Allow connections from our Tinc VPN +# Allow connections from our VPN geth_websocket_origins: '*' # Memory settings geth_cont_mem_ratio: 0.8 diff --git a/ansible/group_vars/nimbus-geth-mainnet.yml b/ansible/group_vars/nimbus-geth-mainnet.yml index c354c74..13b5748 100644 --- a/ansible/group_vars/nimbus-geth-mainnet.yml +++ b/ansible/group_vars/nimbus-geth-mainnet.yml @@ -12,7 +12,7 @@ geth_log_level_name: info geth_websocket_enabled: true # Geth auth geth_account_pass: '{{lookup("passwordstore", "services/Nimbus-Geth/password")}}' -# Allow connections from our Tinc VPN +# Allow connections from our VPN geth_websocket_origins: '*' # Memory settings geth_cont_mem_ratio: 0.7 diff --git a/ansible/requirements.yml b/ansible/requirements.yml index a4e79ee..cc15dd2 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -14,14 +14,9 @@ version: 54125c7d291289aaea51ca313fc694d057d803fa scm: git -- name: infra-role-tinc - src: git@github.com:status-im/infra-role-tinc.git - version: bca648485def8e7a34ed5403bbaf403a2537279a - scm: git - - name: infra-role-bootstrap src: git@github.com:status-im/infra-role-bootstrap.git - version: 244ed6a740d6c20250024de9ae1a0232d71b1f57 + version: 4dfd3e0b32a93e1f07a73c6794684bae21f2e556 scm: git - name: oauth-proxy