From 2106fb5999d285940eb0ca34b0ccc4c7e4d38e78 Mon Sep 17 00:00:00 2001
From: phahulin
Date: Wed, 22 Nov 2017 00:15:10 +0300
Subject: [PATCH] Renames for new repo name
---
README.md | 8 ++++----
{TestTestNet => nodes}/bootnode/install.sh | 12 +++++-------
{TestTestNet => nodes}/bootnode/nginx.default.site | 0
{TestTestNet => nodes}/bootnode/node.toml | 0
{TestTestNet => nodes}/bootnode/template.json | 2 +-
{TestTestNet => nodes}/bootnodes.txt | 0
{TestTestNet => nodes}/common.funcs | 0
{TestTestNet => nodes}/common.vars | 9 +++++++--
{TestTestNet => nodes}/mining-node/install.sh | 10 +++++-----
{TestTestNet => nodes}/mining-node/node.toml | 0
{TestTestNet => nodes}/mining-node/template.json | 2 +-
{TestTestNet => nodes}/netstats-server/install.sh | 13 ++++++-------
{TestTestNet => nodes}/netstats-server/node.toml | 0
.../netstats-server/template.json | 2 +-
{TestTestNet => nodes}/owner/install.sh | 10 +++++-----
{TestTestNet => nodes}/owner/node.toml | 0
{TestTestNet => nodes}/owner/template.json | 2 +-
17 files changed, 36 insertions(+), 34 deletions(-)
rename {TestTestNet => nodes}/bootnode/install.sh (87%)
rename {TestTestNet => nodes}/bootnode/nginx.default.site (100%)
rename {TestTestNet => nodes}/bootnode/node.toml (100%)
rename {TestTestNet => nodes}/bootnode/template.json (99%)
rename {TestTestNet => nodes}/bootnodes.txt (100%)
rename {TestTestNet => nodes}/common.funcs (100%)
rename {TestTestNet => nodes}/common.vars (76%)
rename {TestTestNet => nodes}/mining-node/install.sh (91%)
rename {TestTestNet => nodes}/mining-node/node.toml (100%)
rename {TestTestNet => nodes}/mining-node/template.json (99%)
rename {TestTestNet => nodes}/netstats-server/install.sh (93%)
rename {TestTestNet => nodes}/netstats-server/node.toml (100%)
rename {TestTestNet => nodes}/netstats-server/template.json (99%)
rename {TestTestNet => nodes}/owner/install.sh (89%)
rename {TestTestNet => nodes}/owner/node.toml (100%)
rename {TestTestNet => nodes}/owner/template.json (99%)
diff --git a/README.md b/README.md
index c0ce71a..8bbedff 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
## DEV Network
### Mining node
-[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Foraclesorg%2Ftest-templates%2Fdev-mainnet%2FTestTestNet%2Fmining-node%2Ftemplate.json)
+[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Foraclesorg%2Fdeployment-azure%2Fdev-mainnet%2Fnodes%2Fmining-node%2Ftemplate.json)
### Bootnode
-[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Foraclesorg%2Ftest-templates%2Fdev-mainnet%2FTestTestNet%2Fbootnode%2Ftemplate.json)
+[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Foraclesorg%2Fdeployment-azure%2Fdev-mainnet%2Fnodes%2Fbootnode%2Ftemplate.json)
### Owner
-[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Foraclesorg%2Ftest-templates%2Fdev-mainnet%2FTestTestNet%2Fowner%2Ftemplate.json)
+[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Foraclesorg%2Fdeployment-azure%2Fdev-mainnet%2Fnodes%2Fowner%2Ftemplate.json)
### Netstats server
-[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Foraclesorg%2Ftest-templates%2Fdev-mainnet%2FTestTestNet%2Fnetstats-server%2Ftemplate.json)
+[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Foraclesorg%2Fdeployment-azure%2Fdev-mainnet%2Fnodes%2Fnetstats-server%2Ftemplate.json)
diff --git a/TestTestNet/bootnode/install.sh b/nodes/bootnode/install.sh
similarity index 87%
rename from TestTestNet/bootnode/install.sh
rename to nodes/bootnode/install.sh
index ebed342..e534acb 100644
--- a/TestTestNet/bootnode/install.sh
+++ b/nodes/bootnode/install.sh
@@ -18,15 +18,13 @@ free -m
EXT_IP="$(curl ifconfig.co)"
echo "===== external ip: ${EXT_IP}"
-NGINX_FILE_LOC="https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/bootnode/nginx.default.site"
-
-INSTALL_CONFIG_REPO="https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/bootnode"
-echo "===== repo base path: ${INSTALL_CONFIG_REPO}"
-
echo "===== downloading common.vars"
-curl -sLO "https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/common.vars"
+curl -sLO "https://raw.githubusercontent.com/oraclesorg/deployment-azure/${TEMPLATES_BRANCH}/nodes/common.vars"
source common.vars
+INSTALL_CONFIG_REPO="${REPO_BASE_PATH}/bootnode"
+echo "===== INSTALL_CONFIG_REPO: ${INSTALL_CONFIG_REPO}"
+
# this should be provided through env by azure template
NETSTATS_SERVER="${NETSTATS_SERVER}"
NETSTATS_SECRET="${NETSTATS_SECRET}"
@@ -40,7 +38,7 @@ echo "===== environmental variables:"
printenv
echo "===== downloading common.funcs"
-curl -sLO "https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/common.funcs"
+curl -sLO "https://raw.githubusercontent.com/oraclesorg/deployment-azure/${TEMPLATES_BRANCH}/nodes/common.funcs"
source common.funcs
setup_ufw() {
diff --git a/TestTestNet/bootnode/nginx.default.site b/nodes/bootnode/nginx.default.site
similarity index 100%
rename from TestTestNet/bootnode/nginx.default.site
rename to nodes/bootnode/nginx.default.site
diff --git a/TestTestNet/bootnode/node.toml b/nodes/bootnode/node.toml
similarity index 100%
rename from TestTestNet/bootnode/node.toml
rename to nodes/bootnode/node.toml
diff --git a/TestTestNet/bootnode/template.json b/nodes/bootnode/template.json
similarity index 99%
rename from TestTestNet/bootnode/template.json
rename to nodes/bootnode/template.json
index e7cdfdf..12d51a2 100644
--- a/TestTestNet/bootnode/template.json
+++ b/nodes/bootnode/template.json
@@ -237,7 +237,7 @@
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
- "[concat('https://raw.githubusercontent.com/oraclesorg/test-templates/', variables('TEMPLATES_BRANCH'), '/TestTestNet/bootnode/install.sh')]"
+ "[concat('https://raw.githubusercontent.com/oraclesorg/deployment-azure/', variables('TEMPLATES_BRANCH'), '/nodes/bootnode/install.sh')]"
]
},
"protectedSettings": {
diff --git a/TestTestNet/bootnodes.txt b/nodes/bootnodes.txt
similarity index 100%
rename from TestTestNet/bootnodes.txt
rename to nodes/bootnodes.txt
diff --git a/TestTestNet/common.funcs b/nodes/common.funcs
similarity index 100%
rename from TestTestNet/common.funcs
rename to nodes/common.funcs
diff --git a/TestTestNet/common.vars b/nodes/common.vars
similarity index 76%
rename from TestTestNet/common.vars
rename to nodes/common.vars
index 7e653a7..333c515 100644
--- a/TestTestNet/common.vars
+++ b/nodes/common.vars
@@ -18,11 +18,16 @@ PARITY_DEB_LOC="https://parity-downloads-mirror.parity.io/v1.8.1/x86_64-unknown-
NODE_SOURCE_DEB="https://deb.nodesource.com/setup_6.x"
##### These variables are calculated based on the top ones. They shouldn't be changed
+
+REPO_BASE_PATH="https://raw.githubusercontent.com/oraclesorg/deployment-azure/${TEMPLATES_BRANCH}/nodes"
+
GENESIS_REPO_LOC="https://raw.githubusercontent.com/oraclesorg/oracles-scripts/${SCRIPTS_BRANCH}/spec.json"
GENESIS_JSON="spec.json"
+
NODE_TOML="node.toml"
NODE_PWD="node.pwd"
-BOOTNODES_TXT="https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/bootnodes.txt"
-NGINX_FILE_LOC="https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/bootnode/nginx.default.site"
+
+BOOTNODES_TXT="${REPO_BASE_PATH}/bootnodes.txt"
+NGINX_FILE_LOC="${REPO_BASE_PATH}/bootnode/nginx.default.site"
echo "<===== sourcing common.funcs"
diff --git a/TestTestNet/mining-node/install.sh b/nodes/mining-node/install.sh
similarity index 91%
rename from TestTestNet/mining-node/install.sh
rename to nodes/mining-node/install.sh
index e0e6a8d..23ecd16 100644
--- a/TestTestNet/mining-node/install.sh
+++ b/nodes/mining-node/install.sh
@@ -18,13 +18,13 @@ free -m
EXT_IP="$(curl ifconfig.co)"
echo "===== external ip: ${EXT_IP}"
-INSTALL_CONFIG_REPO="https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/mining-node"
-echo "===== repo base path: ${INSTALL_CONFIG_REPO}"
-
echo "===== downloading common.vars"
-curl -sLO "https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/common.vars"
+curl -sLO "https://raw.githubusercontent.com/oraclesorg/deployment-azure/${TEMPLATES_BRANCH}/nodes/common.vars"
source common.vars
+INSTALL_CONFIG_REPO="${REPO_BASE_PATH}/mining-node"
+echo "===== INSTALL_CONFIG_REPO: ${INSTALL_CONFIG_REPO}"
+
# this should be provided through env by azure template
NETSTATS_SERVER="${NETSTATS_SERVER}"
NETSTATS_SECRET="${NETSTATS_SECRET}"
@@ -42,7 +42,7 @@ echo "===== environmental variables:"
printenv
echo "===== downloading common.funcs"
-curl -sLO "https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/common.funcs"
+curl -sLO "https://raw.githubusercontent.com/oraclesorg/deployment-azure/${TEMPLATES_BRANCH}/nodes/common.funcs"
source common.funcs
set_ssh_keys() {
diff --git a/TestTestNet/mining-node/node.toml b/nodes/mining-node/node.toml
similarity index 100%
rename from TestTestNet/mining-node/node.toml
rename to nodes/mining-node/node.toml
diff --git a/TestTestNet/mining-node/template.json b/nodes/mining-node/template.json
similarity index 99%
rename from TestTestNet/mining-node/template.json
rename to nodes/mining-node/template.json
index f117cb5..019dca8 100644
--- a/TestTestNet/mining-node/template.json
+++ b/nodes/mining-node/template.json
@@ -243,7 +243,7 @@
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
- "[concat('https://raw.githubusercontent.com/oraclesorg/test-templates/', variables('TEMPLATES_BRANCH'), '/TestTestNet/mining-node/install.sh')]"
+ "[concat('https://raw.githubusercontent.com/oraclesorg/deployment-azure/', variables('TEMPLATES_BRANCH'), '/nodes/mining-node/install.sh')]"
]
},
"protectedSettings": {
diff --git a/TestTestNet/netstats-server/install.sh b/nodes/netstats-server/install.sh
similarity index 93%
rename from TestTestNet/netstats-server/install.sh
rename to nodes/netstats-server/install.sh
index 541fd59..b624b4d 100644
--- a/TestTestNet/netstats-server/install.sh
+++ b/nodes/netstats-server/install.sh
@@ -18,15 +18,14 @@ free -m
EXT_IP="$(curl ifconfig.co)"
echo "===== external ip: ${EXT_IP}"
-NETSTATS_SERVER="localhost"
-
-INSTALL_CONFIG_REPO="https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/netstats-server"
-echo "===== repo base path: ${INSTALL_CONFIG_REPO}"
-
echo "===== downloading common.vars"
-curl -sLO "https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/common.vars"
+curl -sLO "https://raw.githubusercontent.com/oraclesorg/deployment-azure/${TEMPLATES_BRANCH}/nodes/common.vars"
source common.vars
+INSTALL_CONFIG_REPO="${REPO_BASE_PATH}/netstats-server"
+echo "===== INSTALL_CONFIG_REPO: ${INSTALL_CONFIG_REPO}"
+
+NETSTATS_SERVER="localhost"
# this should be provided through env by azure template
NETSTATS_SECRET="${NETSTATS_SECRET}"
NODE_FULLNAME="${NODE_FULLNAME:-NetStat}"
@@ -39,7 +38,7 @@ echo "===== environmental variables:"
printenv
echo "===== downloading common.funcs"
-curl -sLO "https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/common.funcs"
+curl -sLO "https://raw.githubusercontent.com/oraclesorg/deployment-azure/${TEMPLATES_BRANCH}/nodes/common.funcs"
source common.funcs
setup_ufw() {
diff --git a/TestTestNet/netstats-server/node.toml b/nodes/netstats-server/node.toml
similarity index 100%
rename from TestTestNet/netstats-server/node.toml
rename to nodes/netstats-server/node.toml
diff --git a/TestTestNet/netstats-server/template.json b/nodes/netstats-server/template.json
similarity index 99%
rename from TestTestNet/netstats-server/template.json
rename to nodes/netstats-server/template.json
index 3af4067..688dae1 100644
--- a/TestTestNet/netstats-server/template.json
+++ b/nodes/netstats-server/template.json
@@ -230,7 +230,7 @@
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
- "[concat('https://raw.githubusercontent.com/oraclesorg/test-templates/', variables('TEMPLATES_BRANCH'), '/TestTestNet/netstats-server/install.sh')]"
+ "[concat('https://raw.githubusercontent.com/oraclesorg/deployment-azure/', variables('TEMPLATES_BRANCH'), '/nodes/netstats-server/install.sh')]"
]
},
"protectedSettings": {
diff --git a/TestTestNet/owner/install.sh b/nodes/owner/install.sh
similarity index 89%
rename from TestTestNet/owner/install.sh
rename to nodes/owner/install.sh
index f45c1f4..ea9ac12 100644
--- a/TestTestNet/owner/install.sh
+++ b/nodes/owner/install.sh
@@ -18,13 +18,13 @@ free -m
EXT_IP="$(curl ifconfig.co)"
echo "===== external ip: ${EXT_IP}"
-INSTALL_CONFIG_REPO="https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/owner"
-echo "===== repo base path: ${INSTALL_CONFIG_REPO}"
-
echo "===== downloading common.vars"
-curl -sLO "https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/common.vars"
+curl -sLO "https://raw.githubusercontent.com/oraclesorg/deployment-azure/${TEMPLATES_BRANCH}/nodes/common.vars"
source common.vars
+INSTALL_CONFIG_REPO="${REPO_BASE_PATH}/owner"
+echo "===== INSTALL_CONFIG_REPO: ${INSTALL_CONFIG_REPO}"
+
# this should be provided through env by azure template
NETSTATS_SERVER="${NETSTATS_SERVER}"
NETSTATS_SECRET="${NETSTATS_SECRET}"
@@ -40,7 +40,7 @@ echo "===== environmental variables:"
printenv
echo "===== downloading common.funcs"
-curl -sLO "https://raw.githubusercontent.com/oraclesorg/test-templates/${TEMPLATES_BRANCH}/TestTestNet/common.funcs"
+curl -sLO "https://raw.githubusercontent.com/oraclesorg/deployment-azure/${TEMPLATES_BRANCH}/nodes/common.funcs"
source common.funcs
setup_ufw() {
diff --git a/TestTestNet/owner/node.toml b/nodes/owner/node.toml
similarity index 100%
rename from TestTestNet/owner/node.toml
rename to nodes/owner/node.toml
diff --git a/TestTestNet/owner/template.json b/nodes/owner/template.json
similarity index 99%
rename from TestTestNet/owner/template.json
rename to nodes/owner/template.json
index 23741ed..668c2da 100644
--- a/TestTestNet/owner/template.json
+++ b/nodes/owner/template.json
@@ -235,7 +235,7 @@
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
- "[concat('https://raw.githubusercontent.com/oraclesorg/test-templates/', variables('TEMPLATES_BRANCH'), '/TestTestNet/owner/install.sh')]"
+ "[concat('https://raw.githubusercontent.com/oraclesorg/deployment-azure/', variables('TEMPLATES_BRANCH'), '/nodes/owner/install.sh')]"
]
},
"protectedSettings": {