From 03dfc36784cb2596a4ed3c7923f71cec43a24b97 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 7 Feb 2024 17:28:04 -0600 Subject: [PATCH] Removed Xen-Orchestra. --- config-parts/container.sh | 4 ++-- config-parts/firewall-zone.sh | 12 ++++++------ config-parts/interfaces.sh | 28 ++++++++++++++-------------- config-parts/nat.sh | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/config-parts/container.sh b/config-parts/container.sh index edab11d..162c3bc 100644 --- a/config-parts/container.sh +++ b/config-parts/container.sh @@ -57,7 +57,7 @@ set container name speedtest-exporter shared-memory '0' # udp-broadcast-relay-mdns set container name udp-broadcast-relay-mdns allow-host-networks set container name udp-broadcast-relay-mdns cap-add 'net-raw' -set container name udp-broadcast-relay-mdns environment CFG_DEV value 'eth4.20;eth4.40' +set container name udp-broadcast-relay-mdns environment CFG_DEV value 'eth2.20;eth2.40' set container name udp-broadcast-relay-mdns environment CFG_ID value '2' set container name udp-broadcast-relay-mdns environment CFG_MULTICAST value '224.0.0.251' set container name udp-broadcast-relay-mdns environment CFG_PORT value '5353' @@ -70,7 +70,7 @@ set container name udp-broadcast-relay-mdns shared-memory '0' # udp-broadcast-relay-sonos set container name udp-broadcast-relay-sonos allow-host-networks set container name udp-broadcast-relay-sonos cap-add 'net-raw' -set container name udp-broadcast-relay-sonos environment CFG_DEV value 'eth4.20;eth4.40' +set container name udp-broadcast-relay-sonos environment CFG_DEV value 'eth2.20;eth2.40' set container name udp-broadcast-relay-sonos environment CFG_ID value '1' set container name udp-broadcast-relay-sonos environment CFG_MULTICAST value '239.255.255.250' set container name udp-broadcast-relay-sonos environment CFG_PORT value '1900' diff --git a/config-parts/firewall-zone.sh b/config-parts/firewall-zone.sh index 32cf164..a25ccca 100644 --- a/config-parts/firewall-zone.sh +++ b/config-parts/firewall-zone.sh @@ -9,7 +9,7 @@ set firewall zone iot from containers firewall name 'containers-iot' set firewall zone iot from trusted firewall name 'trusted-iot' set firewall zone iot from video firewall name 'video-iot' set firewall zone iot from wan firewall name 'wan-iot' -set firewall zone iot interface 'eth4.30' +set firewall zone iot interface 'eth2.30' # lan set firewall zone lan default-action 'drop' @@ -20,7 +20,7 @@ set firewall zone lan from containers firewall name 'containers-lan' set firewall zone lan from trusted firewall name 'trusted-lan' set firewall zone lan from video firewall name 'video-lan' set firewall zone lan from wan firewall name 'wan-lan' -set firewall zone lan interface 'eth4' +set firewall zone lan interface 'eth2' # local set firewall zone local default-action 'drop' @@ -43,7 +43,7 @@ set firewall zone servers from containers firewall name 'containers-servers' set firewall zone servers from trusted firewall name 'trusted-servers' set firewall zone servers from video firewall name 'video-servers' set firewall zone servers from wan firewall name 'wan-servers' -set firewall zone servers interface 'eth4.10' +set firewall zone servers interface 'eth2.10' # containers set firewall zone containers default-action 'drop' @@ -66,7 +66,7 @@ set firewall zone trusted from servers firewall name 'servers-trusted' set firewall zone trusted from containers firewall name 'containers-trusted' set firewall zone trusted from video firewall name 'video-trusted' set firewall zone trusted from wan firewall name 'wan-trusted' -set firewall zone trusted interface 'eth4.20' +set firewall zone trusted interface 'eth2.20' # video set firewall zone video default-action 'drop' @@ -77,7 +77,7 @@ set firewall zone video from servers firewall name 'servers-video' set firewall zone video from containers firewall name 'containers-video' set firewall zone video from trusted firewall name 'trusted-video' set firewall zone video from wan firewall name 'wan-video' -set firewall zone video interface 'eth4.40' +set firewall zone video interface 'eth2.40' set firewall zone wan default-action 'drop' # wan @@ -88,4 +88,4 @@ set firewall zone wan from servers firewall name 'servers-wan' set firewall zone wan from containers firewall name 'containers-wan' set firewall zone wan from trusted firewall name 'trusted-wan' set firewall zone wan from video firewall name 'video-wan' -set firewall zone wan interface 'eth5' +set firewall zone wan interface 'eth3' diff --git a/config-parts/interfaces.sh b/config-parts/interfaces.sh index ad741f4..73949cd 100644 --- a/config-parts/interfaces.sh +++ b/config-parts/interfaces.sh @@ -1,18 +1,18 @@ #!/bin/vbash -set interfaces ethernet eth5 address 'dhcp' -set interfaces ethernet eth5 description 'WAN' -set interfaces ethernet eth5 hw-id '80:61:5f:04:88:5b' +set interfaces ethernet eth3 address 'dhcp' +set interfaces ethernet eth3 description 'WAN' +set interfaces ethernet eth3 hw-id '80:61:5f:04:88:5b' -set interfaces ethernet eth4 address '10.1.0.1/24' -set interfaces ethernet eth4 description 'LAN' -set interfaces ethernet eth4 hw-id '80:61:5f:04:88:5a' -set interfaces ethernet eth4 vif 10 address '10.1.1.1/24' -set interfaces ethernet eth4 vif 10 description 'SERVERS' -set interfaces ethernet eth4 vif 20 address '10.1.2.1/24' -set interfaces ethernet eth4 vif 20 description 'TRUSTED' -set interfaces ethernet eth4 vif 30 address '10.1.3.1/24' -set interfaces ethernet eth4 vif 30 description 'IOT' -set interfaces ethernet eth4 vif 40 address '10.1.4.1/24' -set interfaces ethernet eth4 vif 40 description 'VIDEO' +set interfaces ethernet eth2 address '10.1.0.1/24' +set interfaces ethernet eth2 description 'LAN' +set interfaces ethernet eth2 hw-id '80:61:5f:04:88:5a' +set interfaces ethernet eth2 vif 10 address '10.1.1.1/24' +set interfaces ethernet eth2 vif 10 description 'SERVERS' +set interfaces ethernet eth2 vif 20 address '10.1.2.1/24' +set interfaces ethernet eth2 vif 20 description 'TRUSTED' +set interfaces ethernet eth2 vif 30 address '10.1.3.1/24' +set interfaces ethernet eth2 vif 30 description 'IOT' +set interfaces ethernet eth2 vif 40 address '10.1.4.1/24' +set interfaces ethernet eth2 vif 40 description 'VIDEO' diff --git a/config-parts/nat.sh b/config-parts/nat.sh index 6561a5f..3c2e403 100644 --- a/config-parts/nat.sh +++ b/config-parts/nat.sh @@ -3,7 +3,7 @@ # Forward Plex to Sting set nat destination rule 110 description 'PLEX' set nat destination rule 110 destination port '32400' -set nat destination rule 110 inbound-interface name 'eth5' +set nat destination rule 110 inbound-interface name 'eth3' set nat destination rule 110 protocol 'tcp' set nat destination rule 110 translation address '10.1.1.12' set nat destination rule 110 translation port '32400' @@ -11,5 +11,5 @@ set nat destination rule 110 translation port '32400' # LAN -> WAN masquerade set nat source rule 100 description 'LAN -> WAN' set nat source rule 100 destination address '0.0.0.0/0' -set nat source rule 100 outbound-interface name 'eth5' +set nat source rule 100 outbound-interface name 'eth3' set nat source rule 100 translation address 'masquerade'