diff --git a/conf/apo.conf.sh b/conf/apo.conf.sh index 17222e5..5521265 100644 --- a/conf/apo.conf.sh +++ b/conf/apo.conf.sh @@ -43,6 +43,8 @@ NET4_IP_eth1="192.168.74.221/24" NET4_MODE_eth2="static" NET4_IP_eth2="10.0.254.221/16" +IPV6_IFACES="eth0 eth1" + NET6_MODE_eth0="static" NET6_IP_eth0="2a03:7220:8081:b301::dd/64" NET6_GW_eth0="2a03:7220:8081:b301::e7" diff --git a/conf/arayat.conf.sh b/conf/arayat.conf.sh index 40eb321..2ca8534 100644 --- a/conf/arayat.conf.sh +++ b/conf/arayat.conf.sh @@ -1,3 +1,4 @@ + # Fichier de configuration principal # ------------------------------------------------------------------------------ @@ -45,6 +46,8 @@ NET4_IP_eth1="192.168.74.220/24" NET4_MODE_eth2="static" NET4_IP_eth2="10.0.254.220/16" +IPV6_IFACES="eth0 eth1" + NET6_MODE_eth0="static" NET6_IP_eth0="2a03:7220:8081:b301::dc/64" NET6_GW_eth0="2a03:7220:8081:b301::e6" diff --git a/conf/cagua.conf.sh b/conf/cagua.conf.sh index 601fe22..41f85a0 100644 --- a/conf/cagua.conf.sh +++ b/conf/cagua.conf.sh @@ -45,6 +45,8 @@ NET4_IP_eth1="192.168.74.206/24" NET4_MODE_eth2="static" NET4_IP_eth2="10.0.254.206/16" +IPV6_IFACES="eth0 eth1" + NET6_MODE_eth0="static" NET6_IP_eth0="2a03:7220:8081:b301::ce/64" NET6_GW_eth0="2a03:7220:8081:b301::e7" diff --git a/conf/didicas.conf.sh b/conf/didicas.conf.sh index 54fe3bb..1bf13ce 100644 --- a/conf/didicas.conf.sh +++ b/conf/didicas.conf.sh @@ -45,6 +45,8 @@ NET4_IP_eth1="192.168.74.205/24" NET4_MODE_eth2="static" NET4_IP_eth2="10.0.254.205/16" +IPV6_IFACES="eth0 eth1" + NET6_MODE_eth0="static" NET6_IP_eth0="2a03:7220:8081:b301::cd/64" NET6_GW_eth0="2a03:7220:8081:b301::e6" diff --git a/conf/labo.conf.sh b/conf/labo.conf.sh index d354f97..977e9b2 100644 --- a/conf/labo.conf.sh +++ b/conf/labo.conf.sh @@ -42,6 +42,8 @@ NET4_NS_SEARCH_eth0=$REALM NET4_MODE_eth1="static" NET4_IP_eth1="10.0.254.207/16" +IPV6_IFACES="eth0" + NET6_MODE_eth0="static" NET6_IP_eth0="2a03:7220:8081:b301::cf/64" NET6_GW_eth0="2a03:7220:8081:b301::e6" diff --git a/conf/latukan.conf.sh b/conf/latukan.conf.sh index 2abdee0..9fb8bcd 100644 --- a/conf/latukan.conf.sh +++ b/conf/latukan.conf.sh @@ -42,6 +42,8 @@ NET4_NS_SEARCH_eth0=$REALM NET4_MODE_eth1="static" NET4_IP_eth1="10.0.254.235/16" +IPV6_IFACES="eth0" + NET6_MODE_eth0="static" NET6_IP_eth0="2a03:7220:8081:b301::eb/64" NET6_GW_eth0="2a03:7220:8081:b301::e7" diff --git a/conf/mariveles.conf.sh b/conf/mariveles.conf.sh index 942ccf5..8dcbf3d 100644 --- a/conf/mariveles.conf.sh +++ b/conf/mariveles.conf.sh @@ -42,6 +42,8 @@ NET4_NS_SEARCH_eth0=$REALM NET4_MODE_eth1="static" NET4_IP_eth1="10.0.254./16" +IPV6_IFACES="eth0" + NET6_MODE_eth0="static" NET6_IP_eth0="2a03:7220:8081:b301::/64" NET6_GW_eth0="2a03:7220:8081:b301::e6" diff --git a/conf/natib.conf.sh b/conf/natib.conf.sh index 4d2f4ee..6788708 100644 --- a/conf/natib.conf.sh +++ b/conf/natib.conf.sh @@ -42,6 +42,8 @@ NET4_NS_SEARCH_eth0=$REALM NET4_MODE_eth1="static" NET4_IP_eth1="10.0.254.208/16" +IPV6_IFACES="eth0" + NET6_MODE_eth0="static" NET6_IP_eth0="2a03:7220:8081:b301::d0/64" NET6_GW_eth0="2a03:7220:8081:b301::e7" diff --git a/conf/silay.conf.sh b/conf/silay.conf.sh index cd757e5..3cef6a4 100644 --- a/conf/silay.conf.sh +++ b/conf/silay.conf.sh @@ -45,6 +45,8 @@ NET4_IP_eth1="192.168.74.215/24" NET4_MODE_eth2="static" NET4_IP_eth2="10.0.254.215/16" +IPV6_IFACES="eth0 eth1" + NET6_MODE_eth0="static" NET6_IP_eth0="2a03:7220:8081:b301::d7/64" NET6_GW_eth0="2a03:7220:8081:b301::e6" diff --git a/modules/conf_network.sh b/modules/conf_network.sh index ba47e5c..5ee62c2 100644 --- a/modules/conf_network.sh +++ b/modules/conf_network.sh @@ -122,7 +122,7 @@ precheck_conf_network() fi done fi - if [[ -z $IPV4_IFACES ]]; then + if [[ -z $IPV6_IFACES ]]; then prnt W "No IPv6 interfaces to configure." else for iface in $IPV6_IFACES; do @@ -134,10 +134,10 @@ precheck_conf_network() if [[ -z $(eval echo \$NET6_IP_$iface) ]]; then prnt E "No IPv6 have been assigned to static interface $iface!" fi - prnt I "Interface $iface will have $(eval echo \$NET6_IP_$iface) static IPv6 address." + prnt I " * Interface $iface will have $(eval echo \$NET6_IP_$iface) static IPv6 address." ;; "dhcp") - prnt I "Interface $iface will use DHCPv6." + prnt I " * Interface $iface will use DHCPv6." ;; "manual") file_exists $(eval echo \$NET6_MANUAL_FILE_$iface)