From 212f40584885e6a3a5689200f2bbe8b1b42fe8f9 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Mon, 26 May 2025 14:17:06 +0200
Subject: [PATCH] Update configuration for UPC network

For now we keep the two IP addresses for BSC and UPC networks, so we
don't lose connectivity.
---
 m/fox/configuration.nix | 49 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/m/fox/configuration.nix b/m/fox/configuration.nix
index 24a3d2c9..29281a73 100644
--- a/m/fox/configuration.nix
+++ b/m/fox/configuration.nix
@@ -4,7 +4,6 @@
   imports = [
     ../common/base.nix
     ../common/xeon/console.nix
-    ../common/xeon/net.nix
     ../module/emulation.nix
   ];
 
@@ -21,11 +20,51 @@
   hardware.cpu.intel.updateMicrocode = lib.mkForce false;
 
   networking = {
+    defaultGateway = "147.83.30.130";
+    nameservers = [ "8.8.8.8" ];
     hostName = "fox";
-    interfaces.enp1s0f0np0.ipv4.addresses = [ {
-      address = "10.0.40.26";
-      prefixLength = 24;
-    } ];
+    interfaces.enp1s0f0np0.ipv4.addresses = [
+      {
+        # BSC network (to be removed)
+        address = "10.0.40.26";
+        prefixLength = 24;
+      }
+      {
+        # UPC network
+        # Public IP configuration:
+        # - Hostname: fox.ac.upc.edu
+        # - IP: 147.83.30.141
+        # - Gateway: 147.83.30.130
+        # - NetMask: 255.255.255.192
+        # Private IP configuration for BMC:
+        # - Hostname: fox-ipmi.ac.upc.edu
+        # - IP: 147.83.35.27
+        # - Gateway: 147.83.35.2
+        # - NetMask: 255.255.255.0
+        address = "147.83.30.141";
+        prefixLength = 26; # 255.255.255.192
+      }
+    ];
+    extraHosts = ''
+      # Fox UPC
+      147.83.30.141   fox.ac.upc.edu
+      147.83.35.27    fox-ipmi.ac.upc.edu
+      # Fox BSC
+      10.0.40.26      fox
+      10.0.40.126     fox-ipmi
+    '' +
+    # To be removed:
+    ''
+      # Hut BSC
+      10.0.40.7       hut
+    '';
+
+    # To be removed:
+    proxy = {
+      default = "http://hut:23080/";
+      noProxy = "127.0.0.1,localhost,internal.domain,10.0.40.40,hut";
+      allProxy = null;
+    };
   };
 
   # Configure Nvidia driver to use with CUDA