nix
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to procul postgres SSL certs

This commit is contained in:
niten 2021-11-29 21:18:58 -08:00
parent e9f9b9b093
commit 492f3cf688
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
config/host-config/procul.nix
View File

@ -3,6 +3,7 @@
with lib; with lib;
let let
hostname = "procul"; hostname = "procul";
host-ipv4 = "172.86.179.18"; host-ipv4 = "172.86.179.18";
git-ipv4 = "172.86.179.19"; git-ipv4 = "172.86.179.19";
domain-name = config.fudo.hosts.${hostname}.domain; domain-name = config.fudo.hosts.${hostname}.domain;
@ -14,10 +15,6 @@ let
local-networks = local-networks =
domain.local-networks ++ site.local-networks; domain.local-networks ++ site.local-networks;
acme-private-key = hostname: "/var/lib/acme/${hostname}/key.pem";
acme-certificate = hostname: "/var/lib/acme/${hostname}/fullchain.pem";
acme-ca = "/etc/nixos/static/letsencryptauthorityx3.pem";
local-packages = with pkgs; [ ldns.examples ]; local-packages = with pkgs; [ ldns.examples ];
secrets = config.fudo.secrets.host-secrets.procul; secrets = config.fudo.secrets.host-secrets.procul;
@ -87,6 +84,14 @@ in {
fudo = { fudo = {
hosts.procul.external-interfaces = [ "extif0" ]; hosts.procul.external-interfaces = [ "extif0" ];
acme.host-domains.${hostname}.${host-fqdn}.local-copies = {
postgresql = {
user = postgresql-user;
dependent-services = [ "postgresql.service" ];
part-of = [ config.fudo.postgresql.systemd-target ];
};
};
secrets.host-secrets.procul = let secrets.host-secrets.procul = let
files = config.fudo.secrets.files; files = config.fudo.secrets.files;
in { in {
@ -170,10 +175,12 @@ in {
}; };
}; };
postgresql = { postgresql = let
cert-copy = config.fudo.acme.host-domains.${hostname}.${host-fqdn}.local-copies.postgresql;
in {
enable = true; enable = true;
ssl-certificate = (acme-certificate host-fqdn); ssl-certificate = cert-copy.full-certificate;
ssl-private-key = (acme-private-key host-fqdn); ssl-private-key = cert-copy.private-key;
keytab = secrets.postgres-keytab.target-file; keytab = secrets.postgres-keytab.target-file;
local-networks = local-networks; local-networks = local-networks;

4
flake.nix
View File

@ -57,8 +57,8 @@
latest-modified-timestamp = head latest-modified-timestamp = head
(sort (a: b: a > b) (sort (a: b: a > b)
(filter (timestamp: timestamp != null) (map (input: toInt input.lastModifiedDate)
(map (input: toInt input.lastModifiedDate) (filter (input: hasAttr "lastModifiedDate" input)
(attrValues inputs)))); (attrValues inputs))));
concat-timestamp = timestamp: concat-timestamp = timestamp: