axeman/pub-solar-infra-new
1
0
Fork 0
forked from pub-solar/infra
Code Pull requests Activity

Merge pull request 'fix promtail host label' (#204) from fix-promtail-label into main

Browse source 
Reviewed-on: pub-solar/infra#204
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
This commit is contained in:
teutat3s 2024-06-06 17:50:08 +00:00
parent 3b865a688c 6ea916603c
commit ba76973cc5
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
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
::1 mail.pub.solar mail
'';
networking.domain = "pub.solar";
networking.hostId = "00000002";
networking.enableIPv6 = true;

1
hosts/nachtigall/networking.nix
View file

@ -7,7 +7,6 @@
{
networking.hostName = "nachtigall";
networking.domain = "pub.solar";
networking.hostId = "00000001";
# 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 = {
hostName = "tankstelle";
domain = "pub.solar";
enableIPv6 = true;
defaultGateway = {
address = "80.244.242.1";

2
modules/core/networking.nix
View file

@ -27,6 +27,8 @@
# Don't expose SSH via public interfaces
networking.firewall.interfaces.wg-ssh.allowedTCPPorts = [ 22 ];
networking.domain = config.pub-solar-os.networking.domain;
networking.hosts = {
"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}" ];

2
modules/promtail/default.nix
View file

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