diff --git a/host/Rory-desktop/nginx.nix b/host/Rory-desktop/nginx.nix
index 31ec0ea..dfb1d03 100644
--- a/host/Rory-desktop/nginx.nix
+++ b/host/Rory-desktop/nginx.nix
@@ -13,7 +13,7 @@
recommendedProxySettings = true;
#recommendedTlsSettings = true;
recommendedZstdSettings = true;
- recommendedGzipSettings = true;
+# recommendedGzipSettings = true;
recommendedBrotliSettings = true;
recommendedOptimisation = true;
#defaultMimeTypes = ../../../../modules/packages/nginx/mime.types;
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index 725384a..539c96e 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -48,13 +48,18 @@
"vb-+"
];
externalInterface = "ens18";
- #enableIPv6 = true;
+ enableIPv6 = false;
};
- enableIPv6 = lib.mkForce true;
+ enableIPv6 = lib.mkForce false;
nameservers = lib.mkOverride [
"192.168.1.1"
];
};
+
+
+ environment.etc."resolv.conf".text = lib.mkOverride ''
+ nameserver 192.168.1.1
+ '';
monitoring = {
monitorAll = true;
@@ -91,7 +96,7 @@
};
containers."draupnir-cme" = import ./services/containers/draupnir-cme/container.nix { inherit pkgs lib nixpkgs-Draupnir; };
- containers."draupnir-linux-mint" = import ./services/containers/draupnir-linux-mint/container.nix { inherit pkgs lib nixpkgs-Draupnir; };
+ #containers."draupnir-linux-mint" = import ./services/containers/draupnir-linux-mint/container.nix { inherit pkgs lib nixpkgs-Draupnir; };
system.stateVersion = "22.11"; # DO NOT EDIT!
diff --git a/host/Rory-nginx/services/containers/draupnir-cme/container.nix b/host/Rory-nginx/services/containers/draupnir-cme/container.nix
index 6ea20a4..b8936ac 100755
--- a/host/Rory-nginx/services/containers/draupnir-cme/container.nix
+++ b/host/Rory-nginx/services/containers/draupnir-cme/container.nix
@@ -17,10 +17,8 @@
];
nixpkgs.overlays = [ (final: prev: { draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir; }) ];
};
- hostAddress = "192.168.100.16";
+ hostAddress = "192.168.100.1";
localAddress = "192.168.100.17";
- #hostAddress6 = "fc00::3";
- #localAddress6 = "fc00::4";
bindMounts."draupnir-access-token" = {
hostPath = "/etc/draupnir-cme-access-token";
diff --git a/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix b/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix
index 6a126f1..17c981a 100755
--- a/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix
+++ b/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix
@@ -17,10 +17,8 @@
];
nixpkgs.overlays = [ (final: prev: { draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir; }) ];
};
- hostAddress = "192.168.100.18";
+ hostAddress = "192.168.100.1";
localAddress = "192.168.100.19";
- #hostAddress6 = "fc00::3";
- #localAddress6 = "fc00::4";
bindMounts."draupnir-access-token" = {
hostPath = "/etc/draupnir-linux-mint-access-token";
diff --git a/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix b/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
index 987348e..35c4bea 100755
--- a/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
@@ -30,6 +30,6 @@
allowedTCPPorts = [ 80 ];
};
};
- hostAddress = "192.168.100.14";
+ hostAddress = "192.168.100.1";
localAddress = "192.168.100.15";
}
diff --git a/host/Rory-nginx/services/containers/matrixunittests/container.nix b/host/Rory-nginx/services/containers/matrixunittests/container.nix
index d81fd2f..1de1ddf 100755
--- a/host/Rory-nginx/services/containers/matrixunittests/container.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests/container.nix
@@ -31,8 +31,6 @@
];
};
};
- hostAddress = "192.168.100.12";
+ hostAddress = "192.168.100.1";
localAddress = "192.168.100.13";
- hostAddress6 = "fc00::3";
- localAddress6 = "fc00::4";
}
diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
index 837ae11..38049db 100755
--- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
@@ -29,8 +29,6 @@
allowedTCPPorts = [ 80 ];
};
};
- hostAddress = "192.168.100.10";
+ hostAddress = "192.168.100.1";
localAddress = "192.168.100.11";
- hostAddress6 = "fc00::1";
- localAddress6 = "fc00::2";
}
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/sync.nix b/host/Rory-nginx/services/matrix/synapse/workers/sync.nix
index 3fd07da..67b63dd 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/sync.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/sync.nix
@@ -2,9 +2,9 @@
let
cfg = config.services.matrix-synapse;
- dbGroup = "small";
+ dbGroup = "medium";
workers = lib.range 0 (cfg.syncWorkers - 1);
- workerName = "medium";
+ workerName = "sync";
workerRoutes = {
client = [
"~ ^/_matrix/client/(v2_alpha|r0|v3)/sync$"
diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix
index 1842a2e..bd6e62d 100755
--- a/host/Rory-nginx/services/nginx/nginx.nix
+++ b/host/Rory-nginx/services/nginx/nginx.nix
@@ -19,7 +19,7 @@ in
recommendedProxySettings = true;
recommendedTlsSettings = true;
recommendedZstdSettings = true;
- recommendedGzipSettings = true;
+ #recommendedGzipSettings = true;
recommendedBrotliSettings = true;
recommendedOptimisation = true;
defaultMimeTypes = ../../../../modules/packages/nginx/mime.types;
|
