Merge common.nix and c3d2.nix to hq.nix
This commit is contained in:
parent
5063287196
commit
6f8d9f7c97
|
@ -9,7 +9,7 @@
|
||||||
[ ../../lib/lxc-container.nix
|
[ ../../lib/lxc-container.nix
|
||||||
../../lib/shared.nix
|
../../lib/shared.nix
|
||||||
../../lib/admins.nix
|
../../lib/admins.nix
|
||||||
../../lib/common/common.nix
|
../../lib/hq.nix
|
||||||
<nixpkgs/nixos/modules/profiles/minimal.nix>
|
<nixpkgs/nixos/modules/profiles/minimal.nix>
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
./adc.nix
|
./adc.nix
|
||||||
./hydra.nix
|
./hydra.nix
|
||||||
./cache.nix
|
./cache.nix
|
||||||
./../../lib/common/c3d2.nix
|
./../../lib/hq.nix
|
||||||
./../../lib/yggdrasil.nix
|
./../../lib/yggdrasil.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@
|
||||||
device = "rootfs";
|
device = "rootfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.hostName = "192";
|
networking.hostName = "hydra";
|
||||||
|
|
||||||
networking.useHostResolvConf = true;
|
networking.useHostResolvConf = true;
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ in {
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../../lib/admins.nix
|
../../lib/admins.nix
|
||||||
../../lib/common/common.nix
|
../../lib/hq.nix
|
||||||
../../lib/users.nix
|
../../lib/users.nix
|
||||||
../../lib/mpd.nix
|
../../lib/mpd.nix
|
||||||
../../lib/yggdrasil.nix
|
../../lib/yggdrasil.nix
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../../lib/common/c3d2.nix
|
../../lib/hq.nix
|
||||||
../../lib/shared.nix
|
../../lib/shared.nix
|
||||||
../../lib/users.nix
|
../../lib/users.nix
|
||||||
./ncdc.nix
|
./ncdc.nix
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
networking = {
|
|
||||||
nameservers = [ "172.20.72.6" "9.9.9.9" "74.82.42.42" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# add central logging
|
|
||||||
services.journalbeat = {
|
|
||||||
enable = true;
|
|
||||||
extraConfig = ''
|
|
||||||
journalbeat:
|
|
||||||
seek_position: cursor
|
|
||||||
cursor_seek_fallback: tail
|
|
||||||
write_cursor_state: true
|
|
||||||
cursor_flush_period: 5s
|
|
||||||
clean_field_names: true
|
|
||||||
convert_to_numbers: false
|
|
||||||
move_metadata_to_field: journal
|
|
||||||
default_type: journal
|
|
||||||
kernel: true
|
|
||||||
output.logstash:
|
|
||||||
# Boolean flag to enable or disable the output module.
|
|
||||||
enabled: true
|
|
||||||
hosts: ["logging.serv.zentralwerk.org:5044", "172.20.73.13:5044"]
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,13 +1,9 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ ./common.nix ];
|
|
||||||
|
|
||||||
users.motd = builtins.readFile ./motd;
|
|
||||||
|
|
||||||
networking.domain = "hq.c3d2.de";
|
networking.domain = "hq.c3d2.de";
|
||||||
|
|
||||||
nix = if config.services.nix-serve.enable then
|
nix = if config.networking.hostName == "hydra" then
|
||||||
{ }
|
{ }
|
||||||
else {
|
else {
|
||||||
binaryCaches = [ "https://nix-serve.hq.c3d2.de" ];
|
binaryCaches = [ "https://nix-serve.hq.c3d2.de" ];
|
||||||
|
@ -15,4 +11,5 @@
|
||||||
[ "nix-serve.hq.c3d2.de:FEi9GyFkou1Ua8INaEKmuGaww9E5y3XwrNGNRfKYeLo=" ];
|
[ "nix-serve.hq.c3d2.de:FEi9GyFkou1Ua8INaEKmuGaww9E5y3XwrNGNRfKYeLo=" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
users.motd = builtins.readFile ./motd;
|
||||||
}
|
}
|
|
@ -4,6 +4,7 @@
|
||||||
imports =
|
imports =
|
||||||
[ <nixpkgs/nixos/modules/profiles/minimal.nix>
|
[ <nixpkgs/nixos/modules/profiles/minimal.nix>
|
||||||
<nixpkgs/nixos/modules/profiles/docker-container.nix>
|
<nixpkgs/nixos/modules/profiles/docker-container.nix>
|
||||||
|
./hq.nix
|
||||||
];
|
];
|
||||||
nix.useSandbox = false;
|
nix.useSandbox = false;
|
||||||
nix.maxJobs = lib.mkDefault 1;
|
nix.maxJobs = lib.mkDefault 1;
|
||||||
|
|
2
secrets
2
secrets
|
@ -1 +1 @@
|
||||||
Subproject commit 92b0134ccb8cb97a3d9bffb471d07654101a1aed
|
Subproject commit 812dec2ee93dc6f2f03fe764a196067f81449314
|
Loading…
Reference in New Issue