From 207d88e90bb585e1d1774b1123686af89f314c96 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Sat, 20 Aug 2022 17:42:38 -0400
Subject: [PATCH] Updates to ip addressing of VMs on bridge.

---
 cluster.sh                     | 11 +++++------
 deployment/stub_lxc_profile.sh | 22 +++++++++++++++++++---
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/cluster.sh b/cluster.sh
index f611936..056ac34 100755
--- a/cluster.sh
+++ b/cluster.sh
@@ -101,7 +101,7 @@ EOL
             ssh "ubuntu@$FQDN" ip link
 
             echo "Please enter the network interface that's dedicated to the Sovereign Stack data plane: "
-            read DATA_PLANE_MACVLAN_INTERFACE
+            read -r DATA_PLANE_MACVLAN_INTERFACE
 
         fi
 
@@ -113,7 +113,7 @@ EOL
 
             USER_DISK=
             echo "Please enter the disk or partition that Sovereign Stack will use to store data (default: loop):  "
-            read USER_DISK
+            read -r USER_DISK
 
         fi
 
@@ -200,14 +200,13 @@ networks:
 - name: lxdbrSS
   type: bridge
   config:
-    ipv4.nat: "true"
+    ipv4.nat: "false"
     ipv6.address: "none"
+    dns.mode: "dynamic"
   managed: true
   description: ss-config,${DATA_PLANE_MACVLAN_INTERFACE:-},${DISK_TO_USE:-}
+  # lxdbrSS is an isolated bridge; no Internet access.
 
-storage_pools: []
-
-projects: []
 cluster:
   server_name: ${CLUSTER_NAME}
   enabled: true
diff --git a/deployment/stub_lxc_profile.sh b/deployment/stub_lxc_profile.sh
index c4b4972..b18a3f0 100755
--- a/deployment/stub_lxc_profile.sh
+++ b/deployment/stub_lxc_profile.sh
@@ -191,10 +191,26 @@ else
         set-name: enp5s0
 
       enp6s0:
-        dhcp4: true
-
+        dhcp4: false
 EOF
 
+    if [[ "$LXD_HOSTNAME" = www-* ]]; then
+        cat >> "$YAML_PATH" <<EOF
+        addresses: [10.139.144.5/24]
+        nameservers:
+          addresses: [10.139.144.1]
+
+EOF
+    fi
+
+    if [[ "$LXD_HOSTNAME" = btcpay-* ]]; then
+        cat >> "$YAML_PATH" <<EOF
+        addresses: [10.139.144.10/24]
+        nameservers:
+          addresses: [10.139.144.1]
+
+EOF
+    fi
 fi
 
 # If we are deploying the www, we attach the vm to the underlay via macvlan.
@@ -213,7 +229,7 @@ EOF
 # TODO get the sovereign-stack lxc profile OFF the lxdbrSS bridge network.
 echo "DATA_PLANE_MACVLAN_INTERFACE: $DATA_PLANE_MACVLAN_INTERFACE"
 
-if [ "$VIRTUAL_MACHINE" = sovereign-stack ] ; then
+if [ "$LXD_HOSTNAME" = sovereign-stack ] ; then
 
 # If we are deploying the www, we attach the vm to the underlay via macvlan.
 cat >> "$YAML_PATH" <<EOF