fix issues.

2017-11-30 00:05:57 +03:00 · 2017-11-30 00:05:57 +03:00 · 7f56fb8605
parent de6ff67fb7
commit 7f56fb8605
11 changed files with 8 additions and 77 deletions
--- a/group_vars/all.example
+++ b/group_vars/all.example
@ -30,10 +30,6 @@ MINING_KEYFILE: "_INSERT_"
 MINING_ADDRESS: "_INSERT_"
 MINING_KEYPASS: "_INSERT_"

-
-SCRIPTS_BRANCH: "sokol"
-
-
 MAIN_REPO_FETCH: "oraclesorg"
 TEMPLATES_BRANCH: "dev-mainnet"
 GENESIS_BRANCH: "master"
--- a/roles/bootnode/tasks/main.yml
+++ b/roles/bootnode/tasks/main.yml
@ -26,7 +26,7 @@
 - name: Download spec.json
  get_url: url={{ item }} dest={{ home }}/ mode=0644
  with_items:
-    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/oracles-scripts/sokol/spec.json"
+    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/oracles-chain-spec/{{ GENESIS_BRANCH }}/spec.json"
    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/deployment-azure/{{ TEMPLATES_BRANCH }}/nodes/bootnodes.txt"
    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/deployment-azure/{{ TEMPLATES_BRANCH }}/nodes/bootnode/node.toml"

--- a/roles/explorer/tasks/main.yml
+++ b/roles/explorer/tasks/main.yml
@ -18,7 +18,7 @@
 - name: Download spec.json
  get_url: url={{ item }} dest={{ home }}/ mode=0644
  with_items:
-    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/oracles-scripts/sokol/spec.json"
+    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/oracles-chain-spec/{{ GENESIS_BRANCH }}/spec.json"
    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/deployment-azure/{{ TEMPLATES_BRANCH }}/nodes/bootnodes.txt"
    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/deployment-azure/{{ TEMPLATES_BRANCH }}/nodes/netstats-server/node.toml"

--- a/roles/explorer/templates/config.js.j2
+++ b/roles/explorer/templates/config.js.j2
@ -6,7 +6,7 @@ var config = function () {
    this.provider = new web3.providers.IpcProvider(this.ipcPath, net);
    this.bootstrapUrl = "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/yeti/bootstrap.min.css";
    this.names = {
-        "{{ OWNER_ADDRESS }}": "Owner",
+        "{{ OWNER_ADDRESS|map('lower') }}": "Master of Ceremony",
    };
 }
 module.exports = config;
--- a/roles/mining/tasks/main.yml
+++ b/roles/mining/tasks/main.yml
@ -18,7 +18,7 @@
 - name: Download spec.json
  get_url: url={{ item }} dest={{ home }}/ mode=0644
  with_items:
-    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/oracles-scripts/sokol/spec.json"
+    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/oracles-chain-spec/{{ GENESIS_BRANCH }}/spec.json"
    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/deployment-azure/{{ TEMPLATES_BRANCH }}/nodes/bootnodes.txt"
    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/deployment-azure/{{ TEMPLATES_BRANCH }}/nodes/mining-node/node.toml"

--- a/roles/mining/templates/transferRewardToPayoutKey.j2
+++ b/roles/mining/templates/transferRewardToPayoutKey.j2
@ -2,6 +2,6 @@
 cd "{{ home }}/oracles-scripts/scripts/"
 echo "Starting at $(date)" >> "/home/{{ username }}/logs/transferRewardToPayoutKey.out"
 echo "Starting at $(date)" >> "/home/{{ username }}/logs/transferRewardToPayoutKey.err"
-/usr/bin/node {{ home }}/oracles-scripts-validator/scripts/transferRewardToPayoutKey.js >> "/home/{{ username }}/logs/transferRewardToPayoutKey.out" 2>> "/home/{{ username }}/logs/transferRewardToPayoutKey.err"
+/usr/bin/node {{ home }}/oracles-scripts-validator/transferRewardToPayoutKey/transferRewardToPayoutKey.js >> "/home/{{ username }}/logs/transferRewardToPayoutKey.out" 2>> "/home/{{ username }}/logs/transferRewardToPayoutKey.err"
 echo "" >> "/home/{{ username }}/logs/transferRewardToPayoutKey.out"
 echo "" >> "/home/{{ username }}/logs/transferRewardToPayoutKey.err"
--- a/roles/netstat/tasks/main.yml
+++ b/roles/netstat/tasks/main.yml
@ -1,12 +1,4 @@
 ---
- name: Create directory parity_data/keys/OraclesPoA
-  file:
-    path: "{{ home }}/parity_data/keys/OraclesPoA"
-    state: directory
-    mode: 0700
-    owner: "{{ username }}"
-    group: "{{ username }}"
-
 - name: Create logs directories
  file:
    path: "/{{ home }}/logs/old"
@ -15,35 +7,12 @@
    owner: "{{ username }}"
    group: "{{ username }}"

- name: Download spec.json
+- name: Download files
  get_url: url={{ item }} dest={{ home }}/ mode=0644
  with_items:
-    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/oracles-scripts/sokol/spec.json"
    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/deployment-azure/{{ TEMPLATES_BRANCH }}/nodes/bootnodes.txt"
    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/deployment-azure/{{ TEMPLATES_BRANCH }}/nodes/netstats-server/node.toml"

-
- name: Change nat in node.toml
-  lineinfile: 
-    path: "{{ home }}/node.toml"
-    insertafter: '^\[network\]'
-    line: nat="extip:{{ ansible_host }}"
-    state: present
-
- name: Change reserved_peers in node.toml
-  lineinfile: 
-    path: "{{ home }}/node.toml"
-    insertafter: '^\[network\]'
-    line: reserved_peers="{{ home }}/bootnodes.txt"
-    state: present
-
- name: Add log file in node.toml
-  blockinfile: 
-    path: "{{ home }}/node.toml"
-    block: |
-      [misc]
-      log_file = "{{ home }}/logs/parity.log"
-
 - git: repo=https://github.com/{{ MAIN_REPO_FETCH }}/eth-netstats dest={{ home }}/eth-netstats

 - file: path={{ home }} owner={{ username }} group={{ username }} recurse=yes
--- a/roles/netstat/templates/app.json.j2
+++ b/roles/netstat/templates/app.json.j2
@ -1,19 +0,0 @@
-[
-    {
-        "name"                 : "explorer",
-        "script"               : "./bin/www",
-        "log_date_format"      : "YYYY-MM-DD HH:mm:SS Z",
-        "error_file"           : "/home/{{ username }}/logs/explorer.err",
-        "out_file"             : "/home/{{ username }}/logs/explorer.out",
-        "merge_logs"           : false,
-        "watch"                : false,
-        "max_restarts"         : 100,
-        "exec_interpreter"     : "node",
-        "exec_mode"            : "fork_mode",
-        "env":
-        {
-            "NODE_ENV"         : "production",
-            "PORT"             : 4000,
-        }
-    }
-]
--- a/roles/netstat/templates/config.js.j2
+++ b/roles/netstat/templates/config.js.j2
@ -1,12 +0,0 @@
-var web3 = require('web3');
-var net = require('net');
-var config = function () {
-    this.logFormat = "combined";
-    this.ipcPath = "/home/{{ username }}/parity_data/jsonrpc.ipc";
-    this.provider = new web3.providers.IpcProvider(this.ipcPath, net);
-    this.bootstrapUrl = "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/yeti/bootstrap.min.css";
-    this.names = {
-        "{{ OWNER_ADDRESS|map('lower') }}": "Master of Ceremony",
-    };
-}
-module.exports = config;
--- a/roles/owner/tasks/main.yml
+++ b/roles/owner/tasks/main.yml
@ -18,7 +18,7 @@
 - name: Download spec.json
  get_url: url={{ item }} dest={{ home }}/ mode=0644
  with_items:
-    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/oracles-scripts/sokol/spec.json"
+    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/oracles-chain-spec/{{ GENESIS_BRANCH }}/spec.json"
    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/deployment-azure/{{ TEMPLATES_BRANCH }}/nodes/bootnodes.txt"
    - "https://raw.githubusercontent.com/{{ MAIN_REPO_FETCH }}/deployment-azure/{{ TEMPLATES_BRANCH }}/nodes/owner/node.toml"

--- a/site.yml
+++ b/site.yml
@ -58,9 +58,6 @@
    - usermanager
    - nodejs
    - oracles-logrotate
-    - oracles-parity
-    - oracles-pm2
-    - oracles-netstats
    - netstat
  tags:
    - netstat
@ -77,8 +74,8 @@
    - usermanager
    - nodejs
    - oracles-logrotate
+    - oracles-parity
    - oracles-pm2
-    - oracles-netstats
    - explorer
  tags:
    - explorer