Skip to content
Permalink
Browse files

Merge branch 'develop' into feature/tf-monitoring

  • Loading branch information...
etienne-napoleone committed May 16, 2019
2 parents 02f0211 + 70307b7 commit 9258a3966c911013693d465523dfdf25073464ad
@@ -129,91 +129,6 @@ services:
- node.labels.project == masternode
- node.labels.masternode == tomochain03

masternode_tomochain04:
image: tomochain/node:stable
environment:
IDENTITY: tomochain04
PASSWORD_FILE: /run/secrets/tomochain_password_tomochain04
PRIVATE_KEY_FILE: /run/secrets/tomochain_pk_tomochain04
BOOTNODES: enode://97f0ca95a653e3c44d5df2674e19e9324ea4bf4d47a46b1d8560f3ed4ea328f725acec3fcfcb37eb11706cf07da669e9688b091f1543f89b2425700a68bc8876@104.248.98.78:30301,enode://b72927f349f3a27b789d0ca615ffe3526f361665b496c80e7cc19dace78bd94785fdadc270054ab727dbb172d9e3113694600dd31b2558dd77ad85a869032dea@188.166.207.189:30301,enode://c8f2f0643527d4efffb8cb10ef9b6da4310c5ac9f2e988a7f85363e81d42f1793f64a9aa127dbaff56b1e8011f90fe9ff57fa02a36f73220da5ff81d8b8df351@104.248.98.60:30301
NETWORK_ID: 88
VERBOSITY: 3
NETSTATS_HOST: stats.tomochain.com
NETSTATS_PORT: 443
WS_SECRET_FILE: /run/secrets/netstats_ws_secret
ANNOUNCE_TXS: 'true'
MAXPEERS: 200
ports:
- target: 30303
published: 30303
protocol: tcp
mode: host
- target: 30303
published: 30303
protocol: udp
mode: host
- target: 8545
published: 8545
protocol: tcp
mode: host
- target: 8546
published: 8546
protocol: tcp
mode: host
secrets:
- tomochain_password_tomochain04
- tomochain_pk_tomochain04
- netstats_ws_secret
volumes:
- sgp1-vol-mainnet-masternode04-chaindata:/tomochain/data
deploy:
placement:
constraints:
- node.labels.project == masternode
- node.labels.masternode == tomochain04

masternode_tomochain05:
image: tomochain/node:stable
environment:
IDENTITY: tomochain05
PASSWORD_FILE: /run/secrets/tomochain_password_tomochain05
PRIVATE_KEY_FILE: /run/secrets/tomochain_pk_tomochain05
BOOTNODES: enode://97f0ca95a653e3c44d5df2674e19e9324ea4bf4d47a46b1d8560f3ed4ea328f725acec3fcfcb37eb11706cf07da669e9688b091f1543f89b2425700a68bc8876@104.248.98.78:30301,enode://b72927f349f3a27b789d0ca615ffe3526f361665b496c80e7cc19dace78bd94785fdadc270054ab727dbb172d9e3113694600dd31b2558dd77ad85a869032dea@188.166.207.189:30301,enode://c8f2f0643527d4efffb8cb10ef9b6da4310c5ac9f2e988a7f85363e81d42f1793f64a9aa127dbaff56b1e8011f90fe9ff57fa02a36f73220da5ff81d8b8df351@104.248.98.60:30301
NETWORK_ID: 88
VERBOSITY: 3
NETSTATS_HOST: stats.tomochain.com
NETSTATS_PORT: 443
WS_SECRET_FILE: /run/secrets/netstats_ws_secret
ANNOUNCE_TXS: 'true'
ports:
- target: 30303
published: 30303
protocol: tcp
mode: host
- target: 30303
published: 30303
protocol: udp
mode: host
- target: 8545
published: 8545
protocol: tcp
mode: host
- target: 8546
published: 8546
protocol: tcp
mode: host
secrets:
- tomochain_password_tomochain05
- tomochain_pk_tomochain05
- netstats_ws_secret
volumes:
- sgp1-vol-mainnet-masternode05-chaindata:/tomochain/data
deploy:
placement:
constraints:
- node.labels.project == masternode
- node.labels.masternode == tomochain05

secrets:
tomochain_password_tomochain01:
external: true
@@ -227,14 +142,7 @@ secrets:
external: true
tomochain_pk_tomochain03:
external: true
tomochain_password_tomochain04:
external: true
tomochain_pk_tomochain04:
external: true
tomochain_password_tomochain05:
external: true
tomochain_pk_tomochain05:
external: true

netstats_ws_secret:
external: true

@@ -245,7 +153,3 @@ volumes:
external: true
sgp1-vol-mainnet-masternode03-chaindata:
external: true
sgp1-vol-mainnet-masternode04-chaindata:
external: true
sgp1-vol-mainnet-masternode05-chaindata:
external: true
@@ -3,12 +3,12 @@ version: "3.4"
services:

fullnode_tomoscan01:
image: tomochain/node:475168736
image: tomochain/node:stable
environment:
IDENTITY: tomoscan01
BOOTNODES: enode://97f0ca95a653e3c44d5df2674e19e9324ea4bf4d47a46b1d8560f3ed4ea328f725acec3fcfcb37eb11706cf07da669e9688b091f1543f89b2425700a68bc8876@104.248.98.78:30301,enode://b72927f349f3a27b789d0ca615ffe3526f361665b496c80e7cc19dace78bd94785fdadc270054ab727dbb172d9e3113694600dd31b2558dd77ad85a869032dea@188.166.207.189:30301,enode://c8f2f0643527d4efffb8cb10ef9b6da4310c5ac9f2e988a7f85363e81d42f1793f64a9aa127dbaff56b1e8011f90fe9ff57fa02a36f73220da5ff81d8b8df351@104.248.98.60:30301
NETWORK_ID: 88
VERBOSITY: 1
VERBOSITY: 4
NETSTATS_HOST: stats.tomochain.com
NETSTATS_PORT: 443
WS_SECRET_FILE: /run/secrets/netstats_ws_secret
@@ -43,7 +43,7 @@ services:
- node.labels.fullnode == tomoscan01

fullnode_tomoscan02:
image: tomochain/node:475168736
image: tomochain/node:stable
environment:
IDENTITY: tomoscan02
BOOTNODES: enode://97f0ca95a653e3c44d5df2674e19e9324ea4bf4d47a46b1d8560f3ed4ea328f725acec3fcfcb37eb11706cf07da669e9688b091f1543f89b2425700a68bc8876@104.248.98.78:30301,enode://b72927f349f3a27b789d0ca615ffe3526f361665b496c80e7cc19dace78bd94785fdadc270054ab727dbb172d9e3113694600dd31b2558dd77ad85a869032dea@188.166.207.189:30301,enode://c8f2f0643527d4efffb8cb10ef9b6da4310c5ac9f2e988a7f85363e81d42f1793f64a9aa127dbaff56b1e8011f90fe9ff57fa02a36f73220da5ff81d8b8df351@104.248.98.60:30301
@@ -12,7 +12,6 @@ services:
placement:
constraints:
- node.labels.project == tomoscan
- node.labels.tomoscan == main
update_config:
parallelism: 1
delay: 10s
@@ -44,7 +43,6 @@ services:
placement:
constraints:
- node.labels.project == tomoscan
- node.labels.tomoscan == main
update_config:
parallelism: 1
delay: 10s
@@ -61,7 +59,6 @@ services:
placement:
constraints:
- node.labels.project == tomoscan
- node.labels.tomoscan == crawl

tomoscan_pending_txs:
image: tomochain/tomoscan-server:stable
@@ -74,7 +71,6 @@ services:
placement:
constraints:
- node.labels.project == tomoscan
- node.labels.tomoscan == main

tomoscan_db:
image: mongo:3.6
@@ -84,15 +80,13 @@ services:
placement:
constraints:
- node.labels.project == tomoscan
- node.labels.tomoscan == db

tomoscan_redis:
image: redis:4-alpine
deploy:
placement:
constraints:
- node.labels.project == tomoscan
- node.labels.tomoscan == main


volumes:
@@ -46,18 +46,6 @@ unset input && read -s input \
echo "Existing private key for node 'tomochain03': "
unset input && read -s input \
; echo $input | docker secret create tomochain_pk_tomochain03 -
echo "New account password for node 'tomochain04': "
unset input && read -s input \
; echo $input | docker secret create tomochain_password_tomochain04 -
echo "Existing private key for node 'tomochain04': "
unset input && read -s input \
; echo $input | docker secret create tomochain_pk_tomochain04 -
echo "New account password for node 'tomochain05': "
unset input && read -s input \
; echo $input | docker secret create tomochain_password_tomochain05 -
echo "Existing private key for node 'tomochain05': "
unset input && read -s input \
; echo $input | docker secret create tomochain_pk_tomochain05 -

echo -e "\n[ loadbalancer ]\n"

@@ -0,0 +1,48 @@
version: "3.4"

services:

node:
image: tomochain/node:stable
environment:
IDENTITY: $IDENTITY
PRIVATE_KEY: $PRIVATE_KEY
BOOTNODES: enode://97f0ca95a653e3c44d5df2674e19e9324ea4bf4d47a46b1d8560f3ed4ea328f725acec3fcfcb37eb11706cf07da669e9688b091f1543f89b2425700a68bc8876@104.248.98.78:30301,enode://b72927f349f3a27b789d0ca615ffe3526f361665b496c80e7cc19dace78bd94785fdadc270054ab727dbb172d9e3113694600dd31b2558dd77ad85a869032dea@188.166.207.189:30301,enode://c8f2f0643527d4efffb8cb10ef9b6da4310c5ac9f2e988a7f85363e81d42f1793f64a9aa127dbaff56b1e8011f90fe9ff57fa02a36f73220da5ff81d8b8df351@104.248.98.60:30301
NETWORK_ID: 88
VERBOSITY: 3
NETSTATS_HOST: stats.tomochain.com
NETSTATS_PORT: 443
WS_SECRET: getty-site-pablo-auger-room-sos-blair-shin-whiz-delhi
volumes:
- $DATA:/tomochain/data/tomo/chaindata
networks:
- masternode
ports:
- 30303:30303/tcp
- 30303:30303/udp
labels:
- traefik.backend=node
- traefik.frontend.rule=Host:rpc.tomochain.com
- traefik.docker.network=masternode
- traefik.port=8545
restart: always

proxy:
image: traefik:alpine
environment:
CF_API_EMAIL: $CLOUDFLARE_EMAIL
CF_API_KEY: $CLOUDFLARE_API_KEY
volumes:
- /var/run/docker.sock:/var/run/docker.sock:rw
- ./acme.json:/acme.json:rw
- ./traefik.toml:/traefik.toml:ro
networks:
- masternode
ports:
- 80:80
- 443:443
labels:
- traefik.enable=false

networks:
masternode:
@@ -0,0 +1,5 @@
IDENTITY=
PRIVATE_KEY=
DATA=
CLOUDFLARE_EMAIL=
CLOUDFLARE_API_KEY=
@@ -0,0 +1,26 @@
defaultEntryPoints = ["http", "https"]

[accessLog]

[entryPoints]
[entryPoints.http]
address = ":80"
[entryPoints.http.redirect]
entryPoint = "https"
[entryPoints.https]
address = ":443"
[entryPoints.https.tls]

[acme]
email = "etienne@tomochain.com"
storage = "acme.json"
entryPoint = "https"
onHostRule = true
[acme.dnsChallenge]
provider = "cloudflare"
delayBeforeCheck = 5

[docker]
domain = "tomochain.com"
watch = true
network = "masternode"
@@ -35,5 +35,5 @@ module "netdata" {
module "tomoscan" {
source = "../modules/tomoscan"

crawler_replicas = 2
crawler_replicas = 6
}

0 comments on commit 9258a39

Please sign in to comment.
You can’t perform that action at this time.