mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-11-13 12:13:46 +01:00
refactor(kubevirt-youko): resolve cert paths with relativeToRoot
The service modules moved two levels deeper, so their certs/ paths resolved relative to the wrong directory. Use mylib.relativeToRoot so they no longer depend on the module's depth.
This commit is contained in:
1 parent
f9c902691b
commit
bc7d62b063
3 files changed
+8
-4
No files matched your search
@@ -1,4 +1,5 @@
|
||||
{
|
||||
mylib,
|
||||
pkgs,
|
||||
config,
|
||||
wallpapers,
|
||||
@@ -7,7 +8,9 @@
|
||||
let
|
||||
hostCommonConfig = ''
|
||||
encode zstd gzip
|
||||
tls ${../../certs/ecc-server.crt} ${config.age.secrets."caddy-ecc-server.key".path} {
|
||||
tls ${mylib.relativeToRoot "certs/ecc-server.crt"} ${
|
||||
config.age.secrets."caddy-ecc-server.key".path
|
||||
} {
|
||||
protocols tls1.3 tls1.3
|
||||
curves x25519 secp384r1 secp521r1
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, ... }:
|
||||
{ config, mylib, ... }:
|
||||
{
|
||||
|
||||
# Declaratively provision Grafana's data sources, dashboards, and alerting rules.
|
||||
@@ -114,7 +114,7 @@
|
||||
postgresVersion = 1500; # 15.xx
|
||||
# tls
|
||||
tlsConfigurationMethod = "file-path";
|
||||
sslRootCertFile = ../../../certs/ecc-ca.crt;
|
||||
sslRootCertFile = mylib.relativeToRoot "certs/ecc-ca.crt";
|
||||
};
|
||||
editable = false;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
config,
|
||||
mylib,
|
||||
pkgs,
|
||||
lib,
|
||||
myvars,
|
||||
@@ -69,7 +70,7 @@ in
|
||||
|
||||
# ssl
|
||||
ssl = true;
|
||||
ssl_cert_file = "${../../certs/ecc-server.crt}";
|
||||
ssl_cert_file = "${mylib.relativeToRoot "certs/ecc-server.crt"}";
|
||||
ssl_key_file = config.age.secrets."postgres-ecc-server.key".path;
|
||||
ssl_min_protocol_version = "TLSv1.3";
|
||||
ssl_ecdh_curve = "secp384r1";
|
||||
|
||||
Reference in new issue
Block a user