Update module options to be compatible with nixpkgs 24.11

This commit is contained in:
fi 2024-12-01 00:35:31 +01:00
parent c973f90cb7
commit 74c12e9658
8 changed files with 47 additions and 55 deletions

View file

@ -3,7 +3,6 @@
services.forgejo = { services.forgejo = {
enable = true; enable = true;
database.type = "postgres"; database.type = "postgres";
mailerPasswordFile = "/secrets/forgejo-mailer-password.secret";
settings = { settings = {
DEFAULT = { DEFAULT = {
@ -60,5 +59,6 @@
HOST = "redis+socket:///run/redis-forgejo/redis.sock"; HOST = "redis+socket:///run/redis-forgejo/redis.sock";
}; };
}; };
secrets.mailer.PASSWD = "/secrets/forgejo-mailer-password.secret";
}; };
} }

View file

@ -3,10 +3,10 @@
services.keycloak = { services.keycloak = {
enable = true; enable = true;
settings = { settings = {
hostname = "id.nekover.se"; hostname = "https://id.nekover.se";
hostname-admin = "keycloak-admin.nekover.se"; hostname-admin = "https://keycloak-admin.nekover.se";
hostname-strict-backchannel = true; proxy-headers = "forwarded";
proxy = "edge"; http-enabled = true;
http-host = "127.0.0.1"; http-host = "127.0.0.1";
http-port = 8080; http-port = 8080;
}; };

View file

@ -15,28 +15,20 @@
]; ];
routes = [ routes = [
{ {
routeConfig = {
Gateway = "10.202.41.1"; Gateway = "10.202.41.1";
Destination = "10.201.0.0/16"; Destination = "10.201.0.0/16";
};
} }
{ {
routeConfig = {
Gateway = "10.202.41.1"; Gateway = "10.202.41.1";
Destination = "10.202.0.0/16"; Destination = "10.202.0.0/16";
};
} }
{ {
routeConfig = {
Gateway = "10.202.41.1"; Gateway = "10.202.41.1";
Destination = "172.21.87.0/24"; Destination = "172.21.87.0/24";
};
} }
{ {
routeConfig = {
Gateway = "10.202.41.1"; Gateway = "10.202.41.1";
Destination = "212.53.203.19/32"; Destination = "212.53.203.19/32";
};
} }
]; ];
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
@ -62,13 +54,11 @@
PrivateKeyFile = "/secrets/wireguard-mail-1-wg0-privatekey.secret"; PrivateKeyFile = "/secrets/wireguard-mail-1-wg0-privatekey.secret";
}; };
wireguardPeers = [{ wireguardPeers = [{
wireguardPeerConfig = {
PublicKey = "ik480irMZtGBs1AFpf1KGzDBekjdziD3ck7XK8r1WXQ="; PublicKey = "ik480irMZtGBs1AFpf1KGzDBekjdziD3ck7XK8r1WXQ=";
PresharedKeyFile = "/secrets/wireguard-valkyrie-mail-1-mail-1-psk.secret"; PresharedKeyFile = "/secrets/wireguard-valkyrie-mail-1-mail-1-psk.secret";
Endpoint = "212.53.203.19:51822"; Endpoint = "212.53.203.19:51822";
AllowedIPs = [ "0.0.0.0/0" ]; AllowedIPs = [ "0.0.0.0/0" ];
PersistentKeepalive = 25; PersistentKeepalive = 25;
};
}]; }];
}; };
}; };

View file

@ -15,28 +15,20 @@
]; ];
routes = [ routes = [
{ {
routeConfig = {
Gateway = "10.201.41.1"; Gateway = "10.201.41.1";
Destination = "10.201.0.0/16"; Destination = "10.201.0.0/16";
};
} }
{ {
routeConfig = {
Gateway = "10.201.41.1"; Gateway = "10.201.41.1";
Destination = "10.202.0.0/16"; Destination = "10.202.0.0/16";
};
} }
{ {
routeConfig = {
Gateway = "10.201.41.1"; Gateway = "10.201.41.1";
Destination = "172.21.87.0/24"; Destination = "172.21.87.0/24";
};
} }
{ {
routeConfig = {
Gateway = "10.201.41.1"; Gateway = "10.201.41.1";
Destination = "217.160.117.160/32"; Destination = "217.160.117.160/32";
};
} }
]; ];
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
@ -62,13 +54,11 @@
PrivateKeyFile = "/secrets/wireguard-mail-2-wg0-privatekey.secret"; PrivateKeyFile = "/secrets/wireguard-mail-2-wg0-privatekey.secret";
}; };
wireguardPeers = [{ wireguardPeers = [{
wireguardPeerConfig = {
PublicKey = "Nnf7x+Yd+l8ZkK2BTq1lK3iiTYgdrgL9PQ/je8smug4="; PublicKey = "Nnf7x+Yd+l8ZkK2BTq1lK3iiTYgdrgL9PQ/je8smug4=";
PresharedKeyFile = "/secrets/wireguard-lifeline-mail-2-mail-2-psk.secret"; PresharedKeyFile = "/secrets/wireguard-lifeline-mail-2-mail-2-psk.secret";
Endpoint = "217.160.117.160:51820"; Endpoint = "217.160.117.160:51820";
AllowedIPs = [ "0.0.0.0/0" ]; AllowedIPs = [ "0.0.0.0/0" ];
PersistentKeepalive = 25; PersistentKeepalive = 25;
};
}]; }];
}; };
}; };

View file

@ -2,7 +2,7 @@
{ {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud29; package = pkgs.nextcloud30;
hostName = "cloud.nekover.se"; hostName = "cloud.nekover.se";
https = true; https = true;
config = { config = {

View file

@ -25,5 +25,5 @@
}; };
}; };
system.stateVersion = "23.11"; system.stateVersion = "24.11";
} }

View file

@ -1,8 +1,19 @@
{ nixpkgs-unstable, ... }: { ... }:
{ {
# The sonarr package is dependend on .NET 6 which is marked as insecure.
# It doesn't seem to build with the later .NET versions.
# In the meantime allow the installation of these insecure packages since sonarr is only reachable locally.
nixpkgs.config = {
permittedInsecurePackages = [
"aspnetcore-runtime-wrapped-6.0.36"
"aspnetcore-runtime-6.0.36"
"dotnet-sdk-wrapped-6.0.428"
"dotnet-sdk-6.0.428"
];
};
services.sonarr = { services.sonarr = {
enable = true; enable = true;
package = nixpkgs-unstable.legacyPackages."x86_64-linux".sonarr;
user = "torrent"; user = "torrent";
group = "torrent"; group = "torrent";
}; };

View file

@ -92,6 +92,7 @@ in
environment = "proxmox"; environment = "proxmox";
}; };
torrent = { torrent = {
hostNixpkgs = nixpkgs-unstable;
site = "vs"; site = "vs";
environment = "proxmox"; environment = "proxmox";
}; };