Move hail into the c3d2 module
Dieser Commit ist enthalten in:
Ursprung
bf82f00f27
Commit
654f2ecf1f
|
@ -7,13 +7,12 @@
|
|||
../../../lib/lxc-container.nix
|
||||
../../../lib/shared.nix
|
||||
../../../lib/admins.nix
|
||||
../../../lib/hail.nix
|
||||
];
|
||||
|
||||
c3d2 = {
|
||||
isInHq = true;
|
||||
mapHqHosts = true;
|
||||
hq.interface = "eth0";
|
||||
enableHail = true;
|
||||
};
|
||||
|
||||
services.openssh.enable = true;
|
||||
|
|
|
@ -9,14 +9,20 @@
|
|||
../../../lib/lxc-container.nix
|
||||
../../../lib/shared.nix
|
||||
../../../lib/admins.nix
|
||||
../../../lib/hail.nix
|
||||
../../../lib
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
ncmpcpp
|
||||
];
|
||||
c3d2 = {
|
||||
isInHq = true;
|
||||
enableHail = true;
|
||||
};
|
||||
|
||||
fileSystems."/mnt/music" = { fsType = "nfs"; device = "172.22.99.10:/mnt/zroot/storage/rpool/Music"; };
|
||||
environment.systemPackages = with pkgs; [ ncmpcpp ];
|
||||
|
||||
fileSystems."/mnt/music" = {
|
||||
fsType = "nfs";
|
||||
device = "172.22.99.10:/mnt/zroot/storage/rpool/Music";
|
||||
};
|
||||
|
||||
networking.hostName = "mpd-index";
|
||||
|
||||
|
|
|
@ -6,21 +6,23 @@
|
|||
|
||||
let
|
||||
#x11vnc-service = with pkgs; import ./x11vnc-service.nix { inherit stdenv pkgs; };
|
||||
in
|
||||
{
|
||||
in {
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nix = {
|
||||
useSandbox = true;
|
||||
buildCores = 2;
|
||||
};
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../lib/default-gateway.nix
|
||||
../../lib/hail.nix
|
||||
../../lib/hq.nix
|
||||
../../lib/yggdrasil.nix
|
||||
];
|
||||
imports = [ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../lib
|
||||
../../lib/yggdrasil.nix
|
||||
];
|
||||
|
||||
c3d2 = {
|
||||
isInHq = true;
|
||||
mapHqHosts = true;
|
||||
enableHail = true;
|
||||
};
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
|
|
@ -8,24 +8,23 @@ let
|
|||
ympdPort = 8080;
|
||||
mpdVhost = "mpd.hq.c3d2.de";
|
||||
in {
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../lib
|
||||
../../lib/admins.nix
|
||||
../../lib/hq.nix
|
||||
../../lib/users.nix
|
||||
../../lib/mpd.nix
|
||||
../../lib/yggdrasil.nix
|
||||
../../lib/hail.nix
|
||||
../../lib/emery.nix
|
||||
imports = [ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../lib
|
||||
../../lib/admins.nix
|
||||
../../lib/hq.nix
|
||||
../../lib/users.nix
|
||||
../../lib/mpd.nix
|
||||
../../lib/yggdrasil.nix
|
||||
../../lib/emery.nix
|
||||
./mpdConsole.nix
|
||||
];
|
||||
];
|
||||
|
||||
c3d2 = {
|
||||
isInHq = true;
|
||||
mapHqHosts = true;
|
||||
hq.interface = "eno1";
|
||||
enableHail = true;
|
||||
};
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
|
|
|
@ -55,12 +55,19 @@ in {
|
|||
|
||||
mapHqHosts = mkOption {
|
||||
type = bool;
|
||||
default = false;
|
||||
default = cfg.isInHq;
|
||||
description = ''
|
||||
Whether to add all internal HQ host mappings to /etc/hosts.
|
||||
'';
|
||||
};
|
||||
|
||||
enableHail = mkOption {
|
||||
type = bool;
|
||||
default = false;
|
||||
description =
|
||||
"Whether to enable Hail continuous deployment from the local Hydra.";
|
||||
};
|
||||
|
||||
hq = {
|
||||
|
||||
/* externalInterface = mkOption {
|
||||
|
@ -208,6 +215,15 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
services.hail = lib.mkIf cfg.enableHail {
|
||||
enable = true;
|
||||
hydraJobUri =
|
||||
"https://hydra.hq.c3d2.de/job/c3d2/hail/${config.networking.hostName}-activator ";
|
||||
# pad the end so the URL doesn't break when systemshit puts a ; on the end
|
||||
package = (import <nixpkgs-unstable> { }).haskellPackages.hail;
|
||||
# Only builds > 19.09
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ ehmry ];
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
{ config, ... }: {
|
||||
|
||||
services.hail = {
|
||||
enable = true;
|
||||
hydraJobUri = "https://hydra.hq.c3d2.de/job/c3d2/hail/${config.networking.hostName}-activator";
|
||||
# Only builds > 19.09
|
||||
package = (import <nixpkgs-unstable> {}).haskellPackages.hail;
|
||||
};
|
||||
}
|
Laden…
In neuem Issue referenzieren