summary refs log tree commit diff
path: root/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
diff options
context:
space:
mode:
Diffstat (limited to 'host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix')
-rwxr-xr-xhost/Rory-nginx/services/containers/matrixunittests-conduit/container.nix20
1 files changed, 7 insertions, 13 deletions
diff --git a/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix b/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
index 08e6760..987348e 100755
--- a/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
@@ -1,9 +1,4 @@
-{
-  pkgs,
-  lib,
-  conduit,
-  ...
-}:
+{ conduit, ... }:
 
 {
   privateNetwork = true;
@@ -19,7 +14,11 @@
       ...
     }:
     {
-      imports = [ ./root.nix ];
+      imports = [
+        ../shared.nix
+        ./services/nginx.nix
+        ./services/conduit.nix
+      ];
       environment.etc."resolv.conf".text = ''
         nameserver 8.8.8.8
         nameserver 8.4.4.8
@@ -28,14 +27,9 @@
       '';
       networking.firewall = {
         enable = true;
-        allowedTCPPorts = [
-          80
-          5432
-        ];
+        allowedTCPPorts = [ 80 ];
       };
     };
   hostAddress = "192.168.100.14";
   localAddress = "192.168.100.15";
-  hostAddress6 = "fc00::5";
-  localAddress6 = "fc00::6";
 }