torjus/nixos-servers
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: torjus:b3ebe3a3b0a169778a4c269d9de27f38fd8d8666
Branches Tags
torjus:master
..
compare: torjus:b06aa943cc2ea91a57570363b6ca0e83b3470f65
Branches Tags
torjus:master

No commits in common. "b3ebe3a3b0a169778a4c269d9de27f38fd8d8666" and "b06aa943cc2ea91a57570363b6ca0e83b3470f65" have entirely different histories.
b3ebe3a3b0 ... b06aa943cc

10 changed files with 28 additions and 77 deletions
Show Stats Expand all files Collapse all files

6
common/vm/default.nix
View File

@ -1,6 +0,0 @@
{ ... }:
{
imports = [
./qemu-guest.nix
];
}

4
common/vm/qemu-guest.nix
View File

@ -1,4 +0,0 @@
{ ... }:
{
services.qemuGuest.enable = true;
}

1
hosts/ca/configuration.nix
View File

@ -8,7 +8,6 @@
../template/hardware-configuration.nix
../../system
../../common/vm
];
nixpkgs.config.allowUnfree = true;

23
hosts/ha1/configuration.nix
View File

@ -1,17 +1,12 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ... }:
{
imports = [
../template/hardware-configuration.nix
imports =
[
../template/hardware-configuration.nix
../../system
../../common/vm
];
../../system
];
nixpkgs.config.allowUnfree = true;
# Use the systemd-boot EFI boot loader.
@ -44,10 +39,7 @@
};
time.timeZone = "Europe/Oslo";
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.tarball-ttl = 0;
environment.systemPackages = with pkgs; [
vim
@ -75,3 +67,4 @@
system.stateVersion = "23.11"; # Did you read the comment?
}

1
hosts/http-proxy/configuration.nix
View File

@ -8,7 +8,6 @@
../template/hardware-configuration.nix
../../system
../../common/vm
];
nixpkgs.config.allowUnfree = true;

3
hosts/monitoring01/configuration.nix
View File

@ -8,7 +8,6 @@
../template/hardware-configuration.nix
../../system
../../common/vm
];
nixpkgs.config.allowUnfree = true;
@ -53,8 +52,6 @@
git
];
services.qemuGuest.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];

27
hosts/ns1/configuration.nix
View File

@ -1,19 +1,14 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ... }:
{
imports = [
../template/hardware-configuration.nix
imports =
[
../template/hardware-configuration.nix
../../system
../../services/ns/master-authorative.nix
../../services/ns/resolver.nix
../../common/vm
];
../../system
../../services/ns/master-authorative.nix
../../services/ns/resolver.nix
];
nixpkgs.config.allowUnfree = true;
# Use the systemd-boot EFI boot loader.
@ -43,10 +38,7 @@
};
time.timeZone = "Europe/Oslo";
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.tarball-ttl = 0;
environment.systemPackages = with pkgs; [
vim
@ -62,3 +54,4 @@
system.stateVersion = "23.11"; # Did you read the comment?
}

27
hosts/ns2/configuration.nix
View File

@ -1,19 +1,14 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ... }:
{
imports = [
../template/hardware-configuration.nix
imports =
[
../template/hardware-configuration.nix
../../system
../../services/ns/secondary-authorative.nix
../../services/ns/resolver.nix
../../common/vm
];
../../system
../../services/ns/secondary-authorative.nix
../../services/ns/resolver.nix
];
nixpkgs.config.allowUnfree = true;
# Use the systemd-boot EFI boot loader.
@ -43,10 +38,7 @@
};
time.timeZone = "Europe/Oslo";
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
environment.systemPackages = with pkgs; [
vim
wget
@ -61,3 +53,4 @@
system.stateVersion = "23.11"; # Did you read the comment?
}

11
services/monitoring/prometheus.nix
View File

@ -36,9 +36,6 @@
];
}
];
globalConfig = {
scrape_interval = "15s";
};
rules = [
''
groups:
@ -127,14 +124,6 @@
}
];
}
{
job_name = "prometheus";
static_configs = [
{
targets = [ "localhost:9090" ];
}
];
}
{
job_name = "pve-exporter";
static_configs = [

2
system/monitoring/metrics.nix
View File

@ -5,8 +5,6 @@
enabledCollectors = [
"systemd"
"logind"
"cgroups"
"processes"
];
};
}