From 202d63fd1ddebf0a37c4cc7912c4e3f457d59342 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Wed, 4 Aug 2021 15:21:54 -0400
Subject: Move Biz/Que/Prod.nix to Biz/Que.nix

---
 Biz/Bild.hs      |  2 +-
 Biz/Que.nix      | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Biz/Que/Prod.nix | 63 --------------------------------------------------------
 3 files changed, 64 insertions(+), 64 deletions(-)
 create mode 100644 Biz/Que.nix
 delete mode 100644 Biz/Que/Prod.nix

(limited to 'Biz')

diff --git a/Biz/Bild.hs b/Biz/Bild.hs
index 08fb208..01a9df7 100644
--- a/Biz/Bild.hs
+++ b/Biz/Bild.hs
@@ -253,7 +253,7 @@ isBuildableNs ns
   where
     nixTargets =
       [ Namespace ["Biz", "Pie"] Namespace.Nix,
-        Namespace ["Biz", "Que", "Prod"] Namespace.Nix,
+        Namespace ["Biz", "Que"] Namespace.Nix,
         Namespace ["Biz", "Cloud"] Namespace.Nix,
         Namespace ["Biz", "Dev"] Namespace.Nix
       ]
diff --git a/Biz/Que.nix b/Biz/Que.nix
new file mode 100644
index 0000000..b94f4d2
--- /dev/null
+++ b/Biz/Que.nix
@@ -0,0 +1,63 @@
+{ bild ? import ./Bild.nix {}
+, nixpkgs ? import ./Bild/Nixpkgs.nix
+}:
+
+# The production server for que.run
+
+bild.os {
+  imports = [
+    ./OsBase.nix
+    ./Packages.nix
+    ./Users.nix
+    ./Que/Host.nix
+    ./Que/Site.nix
+  ];
+  networking.hostName = "prod-que";
+  networking.domain = "que.run";
+  services.que-server = {
+    enable = true;
+    port = 80;
+    package = bild.ghc ./Que/Host.hs;
+  };
+  boot.loader.grub.device = "/dev/vda";
+  fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; };
+  swapDevices = [
+    { device = "/swapfile"; } # 4GB
+  ];
+  networking.firewall.allowedTCPPorts = [ 22 80 443 ];
+  networking = {
+    nameservers = [
+      "67.207.67.2"
+      "67.207.67.3"
+    ];
+    defaultGateway = "157.245.224.1";
+    defaultGateway6 = "2604:a880:2:d1::1";
+    dhcpcd.enable = false;
+    usePredictableInterfaceNames = nixpkgs.lib.mkForce true;
+    interfaces = {
+      eth0 = {
+        ipv4.addresses = [
+          { address="157.245.236.44"; prefixLength=20; }
+          { address="10.46.0.5"; prefixLength=16; }
+        ];
+        ipv6.addresses = [
+          { address="2604:a880:2:d1::a2:5001"; prefixLength=64; }
+          { address="fe80::7892:a5ff:fec6:dbc3"; prefixLength=64; }
+        ];
+        ipv4.routes = [ { address = "157.245.224.1"; prefixLength = 32; } ];
+        ipv6.routes = [ { address = "2604:a880:2:d1::1"; prefixLength = 32; } ];
+      };
+    };
+  };
+  services = {
+    que-website = {
+      enable = true;
+      namespace = "_";
+      package = bild.ghc ./Que/Site.hs;
+    };
+
+    udev.extraRules = ''
+      ATTR{address}=="7a:92:a5:c6:db:c3", NAME="eth0"
+    '';
+  };
+}
diff --git a/Biz/Que/Prod.nix b/Biz/Que/Prod.nix
deleted file mode 100644
index 79097d6..0000000
--- a/Biz/Que/Prod.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ bild ? import ../Bild.nix {}
-, nixpkgs ? import ../Bild/Nixpkgs.nix
-}:
-
-# The production server for que.run
-
-bild.os {
-  imports = [
-    ../OsBase.nix
-    ../Packages.nix
-    ../Users.nix
-    ./Host.nix
-    ./Site.nix
-  ];
-  networking.hostName = "prod-que";
-  networking.domain = "que.run";
-  services.que-server = {
-    enable = true;
-    port = 80;
-    package = bild.ghc ./Host.hs;
-  };
-  boot.loader.grub.device = "/dev/vda";
-  fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; };
-  swapDevices = [
-    { device = "/swapfile"; } # 4GB
-  ];
-  networking.firewall.allowedTCPPorts = [ 22 80 443 ];
-  networking = {
-    nameservers = [
-      "67.207.67.2"
-      "67.207.67.3"
-    ];
-    defaultGateway = "157.245.224.1";
-    defaultGateway6 = "2604:a880:2:d1::1";
-    dhcpcd.enable = false;
-    usePredictableInterfaceNames = nixpkgs.lib.mkForce true;
-    interfaces = {
-      eth0 = {
-        ipv4.addresses = [
-          { address="157.245.236.44"; prefixLength=20; }
-          { address="10.46.0.5"; prefixLength=16; }
-        ];
-        ipv6.addresses = [
-          { address="2604:a880:2:d1::a2:5001"; prefixLength=64; }
-          { address="fe80::7892:a5ff:fec6:dbc3"; prefixLength=64; }
-        ];
-        ipv4.routes = [ { address = "157.245.224.1"; prefixLength = 32; } ];
-        ipv6.routes = [ { address = "2604:a880:2:d1::1"; prefixLength = 32; } ];
-      };
-    };
-  };
-  services = {
-    que-website = {
-      enable = true;
-      namespace = "_";
-      package = bild.ghc ./Site.hs;
-    };
-
-    udev.extraRules = ''
-      ATTR{address}=="7a:92:a5:c6:db:c3", NAME="eth0"
-    '';
-  };
-}
-- 
cgit v1.2.3