X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fdatabases%2Fpostgresql.nix;h=d0b1a7569b8276d7aa8d3ba5b1c225905d2d03a9;hb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;hp=6d1901dad81deeb2fdda20d4f0a1b841489abb7f;hpb=8415083eb6acc343dfa404dbbc12fa0171a48a20;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/databases/postgresql.nix b/modules/private/databases/postgresql.nix index 6d1901d..d0b1a75 100644 --- a/modules/private/databases/postgresql.nix +++ b/modules/private/databases/postgresql.nix @@ -91,16 +91,6 @@ in { ''; readOnly = true; }; - systemdRuntimeDirectory = lib.mkOption { - type = lib.types.str; - # Use ReadWritePaths= instead if socketsDir is outside of /run - default = assert lib.strings.hasPrefix "/run/" cfg.socketsDir; - lib.strings.removePrefix "/run/" cfg.socketsDir; - description = '' - Adjusted Postgresql sockets directory for systemd - ''; - readOnly = true; - }; }; }; @@ -110,7 +100,7 @@ in { security.acme.certs."postgresql" = config.myServices.databasesCerts // { user = "postgres"; group = "postgres"; - plugins = [ "fullchain.pem" "key.pem" "account_key.json" ]; + plugins = [ "fullchain.pem" "key.pem" "account_key.json" "account_reg.json" ]; domain = "db-1.immae.eu"; postRun = '' systemctl reload postgresql.service @@ -119,8 +109,28 @@ in { systemd.services.postgresql.serviceConfig = { SupplementaryGroups = "keys"; - RuntimeDirectory = cfg.systemdRuntimeDirectory; }; + systemd.services.postgresql.postStart = lib.mkAfter '' + # This line is already defined in 19.09 + PSQL="${pkgs.sudo}/bin/sudo -u postgres psql --port=5432" + + ${builtins.concatStringsSep "\n" (lib.mapAttrsToList (role: _: '' + $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${role}'" \ + | grep -q 1 \ + || $PSQL -tAc 'CREATE USER "${role}" WITH REPLICATION' + '') cfg.replicationHosts)} + + ${builtins.concatStringsSep "\n" (lib.mapAttrsToList (role: _: + let + sname = builtins.replaceStrings ["-"] ["_"] role; + in + '' + $PSQL -tAc "SELECT 1 FROM pg_replication_slots WHERE slot_name='${sname}'" \ + | grep -q 1 \ + || $PSQL -tAc "SELECT * FROM pg_create_physical_replication_slot('${sname}')" + '') cfg.replicationHosts)} + ''; + services.postgresql = { enable = true; package = cfg.package; @@ -140,9 +150,12 @@ in { lc_numeric = 'en_US.UTF-8' lc_time = 'en_US.UTF-8' default_text_search_config = 'pg_catalog.english' + # this introduces a small delay before storing on disk, but + # makes it order of magnitudes quicker + synchronous_commit = off ssl = on - ssl_cert_file = '${config.security.acme.directory}/postgresql/fullchain.pem' - ssl_key_file = '${config.security.acme.directory}/postgresql/key.pem' + ssl_cert_file = '${config.security.acme.certs.postgresql.directory}/fullchain.pem' + ssl_key_file = '${config.security.acme.certs.postgresql.directory}/key.pem' ''; authentication = let hosts = builtins.concatStringsSep "\n" (