nixos

commit 4adf6c84ceaef8b5865f05856a69553c018936b0
parent 51424242233b7d1d6748f3ab9976ae6cb66aefa8
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sun, 28 Jan 2024 19:32:23 +0100

Working on opnsense

Diffstat:
M
nixos/common/lib/confd.nix
 | 
2
+-
M
nixos/common/lib/patroni.nix
 | 
12
++++++------
M
nixos/worker-1/configuration.nix
 | 
111
-------------------------------------------------------------------------------

3 files changed, 7 insertions(+), 118 deletions(-)
diff --git a/nixos/common/lib/confd.nix b/nixos/common/lib/confd.nix
@@ -7,7 +7,7 @@
   services.confd = {
     enable = true;
     nodes = [
-      "http://10.0.2.1:2379"
+      "http://10.0.2.3:2379"
       "http://10.0.1.2:2379"
     ];
     prefix = "/service/cluster-1";
diff --git a/nixos/common/lib/patroni.nix b/nixos/common/lib/patroni.nix
@@ -27,10 +27,10 @@
     etcd = {
       enable = true;
       initialClusterState = "new";
-      listenClientUrls = ["http://10.0.2.1:2379"];
-      listenPeerUrls = ["http://10.0.2.1:2380"];
+      listenClientUrls = ["http://10.0.2.3:2379"];
+      listenPeerUrls = ["http://10.0.2.3:2380"];
       initialCluster = [
-        "worker-1=http://10.0.2.1:2380"
+        "worker-1=http://10.0.2.3:2380"
         "nordgedanken=http://10.0.1.2:2380"
       ];
       extraConf = {
@@ -41,14 +41,14 @@
 
     patroni = {
       enable = true;
-      nodeIp = "10.0.2.1";
+      nodeIp = "10.0.2.3";
       name = "worker-1";
       scope = "cluster-1";
       postgresqlPackage = pkgs.postgresql_14;
 
       settings = {
         postgresql = {
-          listen = lib.mkForce "127.0.0.1,10.0.2.1:5432";
+          listen = lib.mkForce "127.0.0.1,10.0.2.3:5432";
           parameters = {
             max_connections = "300";
             superuser_reserved_connections = "3";
@@ -111,7 +111,7 @@
         };
         etcd = {
           hosts = [
-            "10.0.2.1:2379"
+            "10.0.2.3:2379"
             "10.0.1.2:2379"
           ];
         };
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -500,117 +500,6 @@ in {
       '';
     };
 
-    gobgpd = {
-      enable = false;
-      settings = {
-        global = {
-          config = {
-            as = 64513;
-            router-id = "10.0.2.1";
-          };
-        };
-        defined-sets = {
-          prefix-sets = [
-            {
-              prefix-set-name = "ps1";
-              prefix-list = {
-                ip-prefix = "10.0.2.25/32";
-              };
-            }
-          ];
-          neighbor-sets = [
-            {
-              neighbor-set-name = "ns1";
-              neighbor-info-list = ["10.0.1.2" "10.0.2.1"];
-            }
-          ];
-        };
-        policy-definitions = [
-          {
-            name = "pd1";
-            statements = [
-              {
-                name = "statement1";
-                conditions = {
-                  match-prefix-set = {
-                    prefix-set = "ps1";
-                    match-set-options = "any";
-                  };
-                  match-neighbor-set = {
-                    neighbor-set = "ns1";
-                    match-set-options = "any";
-                  };
-                };
-                actions = {
-                  route-disposition = "accept-route";
-                };
-              }
-            ];
-          }
-        ];
-        neighbors = [
-          {
-            config = {
-              neighbor-address = "10.0.1.2";
-              peer-as = 64512;
-            };
-            ebgp-multihop = {
-              config = {
-                enabled = true;
-                multihop-ttl = 3;
-              };
-            };
-            apply-policy = {
-              config = {
-                import-policy-list = ["pd1"];
-              };
-            };
-            route-server = {
-              config = {
-                route-server-client = true;
-              };
-            };
-            afi-safis = [
-              {
-                config = {
-                  afi-safi-name = "rtc";
-                };
-              }
-            ];
-          }
-          {
-            config = {
-              neighbor-address = "10.0.2.2";
-              peer-as = 64514;
-            };
-            ebgp-multihop = {
-              config = {
-                enabled = true;
-                multihop-ttl = 3;
-              };
-            };
-            apply-policy = {
-              config = {
-                import-policy-list = ["pd1"];
-              };
-            };
-            route-server = {
-              config = {
-                route-server-client = true;
-              };
-            };
-            afi-safis = [
-              {
-                config = {
-                  afi-safi-name = "rtc";
-                };
-              }
-            ];
-          }
-        ];
-      };
-    };
-
     bird-lg = {
       proxy = {
         enable = false;