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

Compare commits

base: torjus:8700e787528c5ea872ba8b4a11653795937d0997
Branches Tags
torjus:master
..
compare: torjus:5db87052d38ce4f6152397898f1e574d15ef4f5b
Branches Tags
torjus:master

No commits in common. "8700e787528c5ea872ba8b4a11653795937d0997" and "5db87052d38ce4f6152397898f1e574d15ef4f5b" have entirely different histories.
8700e78752 ... 5db87052d3

22 changed files with 18 additions and 177 deletions
Show Stats Expand all files Collapse all files

7
.sops.yaml
View File

@ -9,7 +9,6 @@ keys:
- &server_inc1 age1g5luz2rtel3surgzuh62rkvtey7lythrvfenyq954vmeyfpxjqkqdj3wt8
- &server_http-proxy age1gq8434ku0xekqmvnseeunv83e779cg03c06gwrusnymdsr3rpufqx6vr3m
- &server_ca age1288993th0ge00reg4zqueyvmkrsvk829cs068eekjqfdprsrkeqql7mljk
- &server_monitoring01 age1vpns76ykll8jgdlu3h05cur4ew2t3k7u03kxdg8y6ypfhsfhq9fqyurjey
creation_rules:
- path_regex: secrets/[^/]+\.(yaml|json|env|ini)
key_groups:
@ -24,7 +23,6 @@ creation_rules:
- *server_inc1
- *server_http-proxy
- *server_ca
- *server_monitoring01
- path_regex: secrets/ns3/[^/]+\.(yaml|json|env|ini)
key_groups:
- age:
@ -35,11 +33,6 @@ creation_rules:
- age:
- *admin_torjus
- *server_ca
- path_regex: secrets/monitoring01/[^/]+\.(yaml|json|env|ini)
key_groups:
- age:
- *admin_torjus
- *server_monitoring01
- path_regex: secrets/ca/keys/.+
key_groups:
- age:

8
flake.lock
View File

@ -23,16 +23,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1732824227,
"narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=",
"lastModified": 1732749044,
"narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9",
"rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}

18
flake.nix
View File

@ -2,7 +2,7 @@
description = "Homelab v5 Nixos Server Configurations";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.11";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
sops-nix = {
@ -215,22 +215,6 @@
sops-nix.nixosModules.sops
];
};
monitoring01 = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {
inherit inputs self sops-nix;
};
modules = [
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/monitoring01
sops-nix.nixosModules.sops
];
};
};
};
}

2
hosts/ca/configuration.nix
View File

@ -35,7 +35,7 @@
"10.69.13.12/24"
];
routes = [
{ Gateway = "10.69.13.1"; }
{ routeConfig.Gateway = "10.69.13.1"; }
];
linkConfig.RequiredForOnline = "routable";
};

2
hosts/ha1/configuration.nix
View File

@ -33,7 +33,7 @@
"10.69.13.9/24"
];
routes = [
{ Gateway = "10.69.13.1"; }
{ routeConfig.Gateway = "10.69.13.1"; }
];
linkConfig.RequiredForOnline = "routable";
};

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

@ -35,7 +35,7 @@
"10.69.13.11/24"
];
routes = [
{ Gateway = "10.69.13.1"; }
{ routeConfig.Gateway = "10.69.13.1"; }
];
linkConfig.RequiredForOnline = "routable";
};

2
hosts/inc1/configuration.nix
View File

@ -45,7 +45,7 @@
VLAN = [ "enp2s0.13" ];
};
routes = [
{ Gateway = "10.69.12.1"; }
{ routeConfig.Gateway = "10.69.12.1"; }
];
linkConfig.RequiredForOnline = "routable";
};

2
hosts/inc2/configuration.nix
View File

@ -45,7 +45,7 @@
VLAN = [ "enp2s0.13" ];
};
routes = [
{ Gateway = "10.69.12.1"; }
{ routeConfig.Gateway = "10.69.12.1"; }
];
linkConfig.RequiredForOnline = "routable";
};

2
hosts/jump/configuration.nix
View File

@ -29,7 +29,7 @@
"10.69.13.10/24"
];
routes = [
{ Gateway = "10.69.13.1"; }
{ routeConfig.Gateway = "10.69.13.1"; }
];
linkConfig.RequiredForOnline = "routable";
};

62
hosts/monitoring01/configuration.nix
View File

@ -1,62 +0,0 @@
{
pkgs,
...
}:
{
imports = [
../template/hardware-configuration.nix
../../system
];
nixpkgs.config.allowUnfree = true;
# Use the systemd-boot EFI boot loader.
boot.loader.grub = {
enable = true;
device = "/dev/sda";
configurationLimit = 3;
};
networking.hostName = "monitoring01";
networking.domain = "home.2rjus.net";
networking.useNetworkd = true;
networking.useDHCP = false;
services.resolved.enable = true;
networking.nameservers = [
"10.69.13.5"
"10.69.13.6"
];
systemd.network.enable = true;
systemd.network.networks."ens18" = {
matchConfig.Name = "ens18";
address = [
"10.69.13.13/24"
];
routes = [
{ Gateway = "10.69.13.1"; }
];
linkConfig.RequiredForOnline = "routable";
};
time.timeZone = "Europe/Oslo";
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
nix.settings.tarball-ttl = 0;
environment.systemPackages = with pkgs; [
vim
wget
git
];
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
networking.firewall.enable = false;
system.stateVersion = "23.11"; # Did you read the comment?
}

7
hosts/monitoring01/default.nix
View File

@ -1,7 +0,0 @@
{ ... }:
{
imports = [
./configuration.nix
../../services/monitoring
];
}

2
hosts/nixos-test1/configuration.nix
View File

@ -30,7 +30,7 @@
"10.69.13.10/24"
];
routes = [
{ Gateway = "10.69.13.1"; }
{ routeConfig.Gateway = "10.69.13.1"; }
];
linkConfig.RequiredForOnline = "routable";
};

2
hosts/ns1/configuration.nix
View File

@ -32,7 +32,7 @@
"10.69.13.5/24"
];
routes = [
{ Gateway = "10.69.13.1"; }
{ routeConfig.Gateway = "10.69.13.1"; }
];
linkConfig.RequiredForOnline = "routable";
};

2
hosts/ns2/configuration.nix
View File

@ -32,7 +32,7 @@
"10.69.13.6/24"
];
routes = [
{ Gateway = "10.69.13.1"; }
{ routeConfig.Gateway = "10.69.13.1"; }
];
linkConfig.RequiredForOnline = "routable";
};

2
hosts/ns3/configuration.nix
View File

@ -32,7 +32,7 @@
"10.69.13.7/24"
];
routes = [
{ Gateway = "10.69.13.1"; }
{ routeConfig.Gateway = "10.69.13.1"; }
];
linkConfig.RequiredForOnline = "routable";
};

2
hosts/ns4/configuration.nix
View File

@ -32,7 +32,7 @@
"10.69.13.8/24"
];
routes = [
{ Gateway = "10.69.13.1"; }
{ routeConfig.Gateway = "10.69.13.1"; }
];
linkConfig.RequiredForOnline = "routable";
};

2
hosts/template/configuration.nix
View File

@ -28,7 +28,7 @@
"10.69.8.250/24"
];
routes = [
{ Gateway = "10.69.8.1"; }
{ routeConfig.Gateway = "10.69.8.1"; }
];
linkConfig.RequiredForOnline = "routable";
};

7
services/monitoring/default.nix
View File

@ -1,7 +0,0 @@
{ ... }:
{
imports = [
./loki.nix
./grafana.nix
];
}

11
services/monitoring/grafana.nix
View File

@ -1,11 +0,0 @@
{ pkgs, ... }:
{
services.grafana = {
enable = true;
settings = {
server = {
http_addr = "";
};
};
};
}

42
services/monitoring/loki.nix
View File

@ -1,42 +0,0 @@
{ ... }:
{
services.loki = {
enable = true;
configuration = {
auth_enabled = false;
server = {
http_listen_port = 3100;
};
common = {
ring = {
instance_addr = "127.0.0.1";
kvstore = {
store = "inmemory";
};
};
replication_factor = 1;
path_prefix = "/var/lib/loki";
};
schema_config = {
configs = [
{
from = "2024-01-01";
store = "tsdb";
object_store = "filesystem";
schema = "v13";
index = {
prefix = "loki_index_";
period = "24h";
};
}
];
};
storage_config = {
filesystem = {
directory = "/var/lib/loki/chunks";
};
};
};
};
}

6
services/monitoring/prometheus.nix
View File

@ -1,6 +0,0 @@
{ ... }:
{
services.prometheus = {
enable = true;
};
}

3
services/ns/zones-home-2rjus-net.conf
View File

@ -1,7 +1,7 @@
$ORIGIN home.2rjus.net.
$TTL 1800
@ IN SOA ns1.home.2rjus.net. admin.test.2rjus.net. (
2042 ; serial number
2041 ; serial number
3600 ; refresh
900 ; retry
1209600 ; expire
@ -62,7 +62,6 @@ sonarr IN CNAME http-proxy
ha IN CNAME http-proxy
z2m IN CNAME http-proxy
ca IN A 10.69.13.12
monitoring01 IN A 10.69.13.13
; 22_WLAN
unifi-ctrl IN A 10.69.22.5