pub-solar/infra
6
1
Fork 3
Code Issues 23 Pull requests 10 Actions Packages Projects 1 Releases Wiki Activity

fix promtail host label #204

Merged
teutat3s merged 2 commits from fix-promtail-label into main 2024-06-06 17:50:09 +00:00
Conversation 0 Commits 2 Files changed 5 +3 -4
5 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hosts/metronom/networking.nix
View file

@ -11,7 +11,6 @@
127.0.0.2 mail.pub.solar mail 127.0.0.2 mail.pub.solar mail
::1 mail.pub.solar mail ::1 mail.pub.solar mail
''; '';
networking.domain = "pub.solar";
networking.hostId = "00000002"; networking.hostId = "00000002";
networking.enableIPv6 = true; networking.enableIPv6 = true;

1
hosts/nachtigall/networking.nix
View file

@ -7,7 +7,6 @@
{ {
networking.hostName = "nachtigall"; networking.hostName = "nachtigall";
networking.domain = "pub.solar";
networking.hostId = "00000001"; networking.hostId = "00000001";
# Network (Hetzner uses static IP assignments, and we don't use DHCP here) # Network (Hetzner uses static IP assignments, and we don't use DHCP here)

1
hosts/tankstelle/networking.nix
View file

@ -7,7 +7,6 @@
{ {
networking = { networking = {
hostName = "tankstelle"; hostName = "tankstelle";
domain = "pub.solar";
enableIPv6 = true; enableIPv6 = true;
defaultGateway = { defaultGateway = {
address = "80.244.242.1"; address = "80.244.242.1";

2
modules/core/networking.nix
View file

@ -27,6 +27,8 @@
# Don't expose SSH via public interfaces # Don't expose SSH via public interfaces
networking.firewall.interfaces.wg-ssh.allowedTCPPorts = [ 22 ]; networking.firewall.interfaces.wg-ssh.allowedTCPPorts = [ 22 ];
networking.domain = config.pub-solar-os.networking.domain;
networking.hosts = { networking.hosts = {
"10.7.6.1" = [ "nachtigall.wg.${config.pub-solar-os.networking.domain}" ]; "10.7.6.1" = [ "nachtigall.wg.${config.pub-solar-os.networking.domain}" ];
"10.7.6.2" = [ "flora-6.wg.${config.pub-solar-os.networking.domain}" ]; "10.7.6.2" = [ "flora-6.wg.${config.pub-solar-os.networking.domain}" ];

2
modules/promtail/default.nix
View file

@ -28,7 +28,7 @@
max_age = "24h"; max_age = "24h";
labels = { labels = {
job = "systemd-journal"; job = "systemd-journal";
host = "nachtigall"; host = config.networking.hostName;
}; };
}; };
relabel_configs = [ relabel_configs = [