summary refs log tree commit diff
path: root/host/Rory-nginx/services
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2024-11-04 01:22:21 +0100
committerRory& <root@rory.gay>2024-11-04 01:22:21 +0100
commite8e69837e6e51723c293ae5223e90ebaf3cbe7ac (patch)
tree5a2ff7a677bd98475f974d774936b5602483db8e /host/Rory-nginx/services
parentpgadmin broke (diff)
downloadRory-Open-Architecture-e8e69837e6e51723c293ae5223e90ebaf3cbe7ac.tar.xz
Clean up resolvconf
Diffstat (limited to 'host/Rory-nginx/services')
-rwxr-xr-xhost/Rory-nginx/services/containers/draupnir-cme/root.nix7
-rw-r--r--host/Rory-nginx/services/containers/draupnir-fedora/root.nix7
-rwxr-xr-xhost/Rory-nginx/services/containers/draupnir-linux-mint/root.nix7
-rwxr-xr-xhost/Rory-nginx/services/containers/matrixunittests-conduit/container.nix7
-rwxr-xr-xhost/Rory-nginx/services/containers/matrixunittests/container.nix7
-rwxr-xr-xhost/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix7
6 files changed, 6 insertions, 36 deletions
diff --git a/host/Rory-nginx/services/containers/draupnir-cme/root.nix b/host/Rory-nginx/services/containers/draupnir-cme/root.nix
index e4da810..0ebce9e 100755
--- a/host/Rory-nginx/services/containers/draupnir-cme/root.nix
+++ b/host/Rory-nginx/services/containers/draupnir-cme/root.nix
@@ -1,12 +1,7 @@
 { ... }:
 
 {
-  environment.etc."resolv.conf".text = ''
-    nameserver 8.8.8.8
-    nameserver 8.4.4.8
-    nameserver 1.1.1.1
-    nameserver 1.0.0.1
-  '';
+  networking.useHostResolvConf = true;
 
   networking.hosts = {
     "192.168.100.1" = [
diff --git a/host/Rory-nginx/services/containers/draupnir-fedora/root.nix b/host/Rory-nginx/services/containers/draupnir-fedora/root.nix
index e4da810..0ebce9e 100644
--- a/host/Rory-nginx/services/containers/draupnir-fedora/root.nix
+++ b/host/Rory-nginx/services/containers/draupnir-fedora/root.nix
@@ -1,12 +1,7 @@
 { ... }:
 
 {
-  environment.etc."resolv.conf".text = ''
-    nameserver 8.8.8.8
-    nameserver 8.4.4.8
-    nameserver 1.1.1.1
-    nameserver 1.0.0.1
-  '';
+  networking.useHostResolvConf = true;
 
   networking.hosts = {
     "192.168.100.1" = [
diff --git a/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix b/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix
index 2254695..2adac62 100755
--- a/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix
+++ b/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix
@@ -1,12 +1,7 @@
 { pkgs, ... }:
 
 {
-  environment.etc."resolv.conf".text = ''
-    nameserver 8.8.8.8
-    nameserver 8.4.4.8
-    nameserver 1.1.1.1
-    nameserver 1.0.0.1
-  '';
+  networking.useHostResolvConf = true;
 
   networking.hosts = {
     "192.168.100.18" = [
diff --git a/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix b/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
index 35c4bea..daefba1 100755
--- a/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
@@ -19,12 +19,7 @@
         ./services/nginx.nix
         ./services/conduit.nix
       ];
-      environment.etc."resolv.conf".text = ''
-        nameserver 8.8.8.8
-        nameserver 8.4.4.8
-        nameserver 1.1.1.1
-        nameserver 1.0.0.1
-      '';
+      networking.useHostResolvConf = true;
       networking.firewall = {
         enable = true;
         allowedTCPPorts = [ 80 ];
diff --git a/host/Rory-nginx/services/containers/matrixunittests/container.nix b/host/Rory-nginx/services/containers/matrixunittests/container.nix
index 1de1ddf..cbd90f8 100755
--- a/host/Rory-nginx/services/containers/matrixunittests/container.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests/container.nix
@@ -17,12 +17,7 @@
         grapevine.nixosModules.default
 
       ];
-      environment.etc."resolv.conf".text = ''
-        nameserver 8.8.8.8
-        nameserver 8.4.4.8
-        nameserver 1.1.1.1
-        nameserver 1.0.0.1
-      '';
+      networking.useHostResolvConf = true;
       networking.firewall = {
         enable = true;
         allowedTCPPorts = [
diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
index 38049db..6be7c83 100755
--- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
@@ -18,12 +18,7 @@
         ./root.nix
         ../shared.nix
       ];
-      environment.etc."resolv.conf".text = ''
-        nameserver 8.8.8.8
-        nameserver 8.4.4.8
-        nameserver 1.1.1.1
-        nameserver 1.0.0.1
-      '';
+      networking.useHostResolvConf = true;
       networking.firewall = {
         enable = true;
         allowedTCPPorts = [ 80 ];