diff --git a/hosts/sql/postgres.nix b/hosts/sql/postgresql.nix similarity index 81% rename from hosts/sql/postgres.nix rename to hosts/sql/postgresql.nix index 61f3af8..0060db2 100644 --- a/hosts/sql/postgres.nix +++ b/hosts/sql/postgresql.nix @@ -7,6 +7,7 @@ let entries = [ (mkEntry "matrix-synapse" 25) # matrix.berlin.ccc.de (mkEntry "hedgedoc" 26) # md.berlin.ccc.de + (mkEntry "grafana" 255) # mon.berlin.ccc.de ]; mkEntry = name: octet: { user = { @@ -47,6 +48,14 @@ in # }; #}; postgresql = { + enable = true; + package = pkgs.postgresql_18; + enableJIT = true; + initdbArgs = [ + "--locale=C" + "--encoding=UTF8" + ]; + settings.listen_addresses = "*"; enableTCPIP = true; #settings = { # ssl = "on"; @@ -58,6 +67,16 @@ in ensureDatabases = map (e: e.database) entries; authentication = "${builtins.concatStringsSep "\n" (map (e: e.auth) entries)}"; }; + postgresqlBackup = { + enable = true; + startAt = "@daily"; + compression = "zstd"; + }; + prometheus.exporters.postgres = { + enable = true; + openFirewall = true; + firewallRules = services.prometheus.exporters.node.firewallRules; + }: }; systemd.services.postgresql.postStart = '' ${config.services.postgresql.package}/bin/psql \ diff --git a/secrets/postgres-grafana.age b/secrets/postgres-grafana.age new file mode 100644 index 0000000..874dca2 Binary files /dev/null and b/secrets/postgres-grafana.age differ diff --git a/services/postgres.nix b/services/postgres.nix deleted file mode 100644 index e50f232..0000000 --- a/services/postgres.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, ... }: - -{ - services = { - postgresql = { - enable = true; - package = pkgs.postgresql_18; - enableJIT = true; - initdbArgs = [ - "--locale=C" - "--encoding=UTF8" - ]; - settings.listen_addresses = "*"; - }; - postgresqlBackup = { - enable = true; - startAt = "@daily"; - compression = "zstd"; - }; - }; -}