From 7d9d79dfc0ebaf749e3ece8e0d3ed34ca78c4c13 Mon Sep 17 00:00:00 2001
From: Leopere <colin@nixc.us>
Date: Tue, 2 Oct 2018 17:08:00 -0400
Subject: [PATCH] Updating IP's to further avoid collisions

---
 chainquery/.env                   | 3 +++
 lbrycrd/.env                      | 2 +-
 lbrycrd/docker-compose.yml        | 2 +-
 lbrycrd/start.sh                  | 2 +-
 lbrynet-daemon/docker-compose.yml | 2 +-
 traefik/docker-compose.yml        | 2 +-
 traefik/network-up.sh             | 2 +-
 www.spee.ch/.env                  | 2 +-
 www.spee.ch/docker-compose.yml    | 8 ++++----
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/chainquery/.env b/chainquery/.env
index 7b123cf..75e65b4 100644
--- a/chainquery/.env
+++ b/chainquery/.env
@@ -1,2 +1,5 @@
 COMPOSE_PROJECT_NAME=chainquery
+RPC_USER=${RPC_USER=lbryrpc}
 RPC_PASSWORD=${RPC_PASSWORD:-$(env LC_CTYPE=C LC_ALL=C tr -dc A-Za-z0-9 < /dev/urandom | head -c 16 | xargs)}
+## This should be the internal container IP from which you'll be calling the RPC for Lbrycrdd from.
+RPC_ALLOW_IP=${RPC_ALLOW_IP:-10.6.0.2}
diff --git a/lbrycrd/.env b/lbrycrd/.env
index 8e7450d..6135184 100644
--- a/lbrycrd/.env
+++ b/lbrycrd/.env
@@ -2,4 +2,4 @@ COMPOSE_PROJECT_NAME=lbrycrd
 RPC_USER=${RPC_USER=lbryrpc}
 RPC_PASSWORD=${RPC_PASSWORD:-$(env LC_CTYPE=C LC_ALL=C tr -dc A-Za-z0-9 < /dev/urandom | head -c 16 | xargs)}
 ## This should be the internal container IP from which you'll be calling the RPC for Lbrycrdd from.
-RPC_ALLOW_IP=${RPC_ALLOW_IP:-10.5.0.2}
+RPC_ALLOW_IP=${RPC_ALLOW_IP:-10.6.0.2}
diff --git a/lbrycrd/docker-compose.yml b/lbrycrd/docker-compose.yml
index 6c08a81..73c0e86 100644
--- a/lbrycrd/docker-compose.yml
+++ b/lbrycrd/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     restart: always
     networks:
       lbrynet
-        ipv4_address: 10.5.0.1
+        ipv4_address: 10.6.0.1
     labels:
       - "traefik.expose=false"
     expose:
diff --git a/lbrycrd/start.sh b/lbrycrd/start.sh
index 61814a0..b3c3c99 100644
--- a/lbrycrd/start.sh
+++ b/lbrycrd/start.sh
@@ -15,5 +15,5 @@ rm -f /var/run/lbrycrdd.pid
   -printtoconsole \
   -rpcport=${RPC_PORT:-9245} \
   -rpcpassword=${RPC_PASSWORD:-changeme} \
-  -rpcallowip=${RPC_ALLOW_IP:-10.5.0.2} \
+  -rpcallowip=${RPC_ALLOW_IP:-10.6.0.2} \
   -rpcuser=${RPC_USER:-lbryrpc}
diff --git a/lbrynet-daemon/docker-compose.yml b/lbrynet-daemon/docker-compose.yml
index 0c45966..0100b82 100644
--- a/lbrynet-daemon/docker-compose.yml
+++ b/lbrynet-daemon/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     restart: always
     networks:
       lbrynet
-        ipv4_address: 10.5.0.3
+        ipv4_address: 10.6.0.3
     labels:
       - "traefik.expose=false"
     ports:
diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 9c76534..7d952ef 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     command: --api --docker --docker.domain=docker.localhost --logLevel=DEBUG
     networks:
       lbrynet
-        ipv4_address: 10.5.0.100
+        ipv4_address: 10.6.0.100
     ports:
       - target: 80
         published: 80
diff --git a/traefik/network-up.sh b/traefik/network-up.sh
index a12386e..1d0304e 100644
--- a/traefik/network-up.sh
+++ b/traefik/network-up.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker network create -d bridge --subnet=10.5.0.10/16 lbrynet
+docker network create -d bridge --subnet=10.6.0.0/16 lbrynet
diff --git a/www.spee.ch/.env b/www.spee.ch/.env
index ad3cb83..057cf48 100644
--- a/www.spee.ch/.env
+++ b/www.spee.ch/.env
@@ -1,6 +1,6 @@
 COMPOSE_PROJECT_NAME=speech
 ## This value can generally be left alone in a default setup.
-MYSQL_SERVER=10.5.0.8
+MYSQL_SERVER=10.6.0.8
 ## Update the rest of these if possible.
 MYSQL_USER=replaceme
 MYSQL_PASSWORD=REPLACEME
diff --git a/www.spee.ch/docker-compose.yml b/www.spee.ch/docker-compose.yml
index 0b49a14..a8b6e52 100644
--- a/www.spee.ch/docker-compose.yml
+++ b/www.spee.ch/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       - ./data/speech:/data
     networks:
       green:
-        ipv4_address: 10.5.0.6
+        ipv4_address: 10.6.0.6
         aliases:
           - speech
 
@@ -47,7 +47,7 @@ services:
       - ./data/lbrynet:/data
     networks:
       green:
-        ipv4_address: 10.5.0.7
+        ipv4_address: 10.6.0.7
         aliases:
           - lbrynet
 
@@ -74,7 +74,7 @@ services:
       - ./data/db:/var/lib/mysql
     networks:
       green:
-        ipv4_address: 10.5.0.8
+        ipv4_address: 10.6.0.8
         aliases:
           - mysql
 
@@ -86,4 +86,4 @@ networks:
     driver: bridge
     ipam:
         config:
-          - subnet: 10.5.0.0/16
+          - subnet: 10.6.0.0/16