diff options
| author | Ben Sima <ben@bsima.me> | 2021-08-04 15:21:54 -0400 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2021-11-26 13:47:37 -0500 |
| commit | 202d63fd1ddebf0a37c4cc7912c4e3f457d59342 (patch) | |
| tree | a910dceca3ac914142e8d36c0cde9dc4430077f0 | |
| parent | 3a4dfc21f7ca11c4015d4955b6791b3bc89247fb (diff) | |
Move Biz/Que/Prod.nix to Biz/Que.nix
| -rw-r--r-- | Biz/Bild.hs | 2 | ||||
| -rw-r--r-- | Biz/Que.nix (renamed from Biz/Que/Prod.nix) | 18 |
2 files changed, 10 insertions, 10 deletions
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/Prod.nix b/Biz/Que.nix index 79097d6..b94f4d2 100644 --- a/Biz/Que/Prod.nix +++ b/Biz/Que.nix @@ -1,23 +1,23 @@ -{ bild ? import ../Bild.nix {} -, nixpkgs ? import ../Bild/Nixpkgs.nix +{ 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 + ./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 ./Host.hs; + package = bild.ghc ./Que/Host.hs; }; boot.loader.grub.device = "/dev/vda"; fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; }; @@ -53,7 +53,7 @@ bild.os { que-website = { enable = true; namespace = "_"; - package = bild.ghc ./Site.hs; + package = bild.ghc ./Que/Site.hs; }; udev.extraRules = '' |