Fix deprecated networkd and forgejo settings
This commit is contained in:
parent
2cf362376c
commit
28817ddac9
7 changed files with 11 additions and 14 deletions
|
@ -2,6 +2,7 @@
|
||||||
networking = {
|
networking = {
|
||||||
domain = mkDefault "kyouma.net";
|
domain = mkDefault "kyouma.net";
|
||||||
dhcpcd.enable = false;
|
dhcpcd.enable = false;
|
||||||
|
useDHCP = false;
|
||||||
nftables.enable = mkDefault true;
|
nftables.enable = mkDefault true;
|
||||||
firewall.logRefusedConnections = mkDefault false;
|
firewall.logRefusedConnections = mkDefault false;
|
||||||
};
|
};
|
||||||
|
|
|
@ -24,12 +24,12 @@
|
||||||
IPv6AcceptRA = false;
|
IPv6AcceptRA = false;
|
||||||
};
|
};
|
||||||
addresses = [
|
addresses = [
|
||||||
{ addressConfig.Address = "95.217.83.107/26"; }
|
{ Address = "95.217.83.107/26"; }
|
||||||
{ addressConfig.Address = "2a01:4f9:4a:1f5f::1/64"; }
|
{ Address = "2a01:4f9:4a:1f5f::1/64"; }
|
||||||
];
|
];
|
||||||
routes = [
|
routes = [
|
||||||
{ routeConfig.Gateway = "95.217.83.65"; }
|
{ Gateway = "95.217.83.65"; }
|
||||||
{ routeConfig.Gateway = "fe80::1"; }
|
{ Gateway = "fe80::1"; }
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -14,10 +14,7 @@
|
||||||
|
|
||||||
kyouma.machine-type.physical = true;
|
kyouma.machine-type.physical = true;
|
||||||
|
|
||||||
networking = {
|
networking.hostName = "integra";
|
||||||
hostName = "integra";
|
|
||||||
useDHCP = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.network.networks."98-eth-default" = {
|
systemd.network.networks."98-eth-default" = {
|
||||||
matchConfig.Type = "ether";
|
matchConfig.Type = "ether";
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
];
|
];
|
||||||
kyouma.machine-type.physical = false;
|
kyouma.machine-type.physical = false;
|
||||||
|
|
||||||
systemd.network.networks."98-eth-static" = {
|
systemd.network.networks."98-eth-default" = {
|
||||||
matchConfig.Type = "ether";
|
matchConfig.Type = "ether";
|
||||||
matchConfig.Name = "e*";
|
matchConfig.Name = "e*";
|
||||||
linkConfig.RequiredForOnline = "routable";
|
linkConfig.RequiredForOnline = "routable";
|
||||||
|
@ -20,8 +20,8 @@
|
||||||
"185.244.193.190/22"
|
"185.244.193.190/22"
|
||||||
];
|
];
|
||||||
routes = [
|
routes = [
|
||||||
{ routeConfig.Gateway = "fe80::1"; }
|
{ Gateway = "fe80::1"; }
|
||||||
{ routeConfig.Gateway = "185.244.192.1"; }
|
{ Gateway = "185.244.192.1"; }
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
services.powerdns = {
|
services.powerdns = {
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
IPv6AcceptRA = false;
|
IPv6AcceptRA = false;
|
||||||
};
|
};
|
||||||
routes = [
|
routes = [
|
||||||
{ routeConfig.Gateway = "fe80::1"; }
|
{ Gateway = "fe80::1"; }
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,5 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.useDHCP = false;
|
|
||||||
networking.useHostResolvConf = false;
|
networking.useHostResolvConf = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
};
|
};
|
||||||
services.forgejo = {
|
services.forgejo = {
|
||||||
enable = true;
|
enable = true;
|
||||||
mailerPasswordFile = config.sops.secrets."services/forgejo/mailerPassword".path;
|
secrets.mailer.PASSWD = config.sops.secrets."services/forgejo/mailerPassword".path;
|
||||||
database = {
|
database = {
|
||||||
createDatabase = true;
|
createDatabase = true;
|
||||||
type = "postgres";
|
type = "postgres";
|
||||||
|
|
Loading…
Reference in a new issue