Skip to content

Commit

Permalink
postgres: add a config.socketDir option
Browse files Browse the repository at this point in the history
* Defaults to config.dataDir
* Allows customization of socketDir for users who do not wish it fixed
  to dataDir
* Sockets are limited to around [100 chars](https://linux.die.net/man/7/unix):
  * In the case that the default or desired dataDir absolute path exceeds
    this char limit, postgres will fail to start if it is also used for
    socketDir
  * In this case, dataDir can remain as desired and socketDir can be set
    separately to a shorter absolute path
  • Loading branch information
johnalotoski committed Jan 17, 2024
1 parent 4fb82e0 commit cb0ae89
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
15 changes: 11 additions & 4 deletions nix/postgres/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ in
description = "The DB data directory";
};

socketDir = lib.mkOption {
type = lib.types.str;
default = config.dataDir;
description = "The DB socket directory";
};

hbaConf =
let
hbaConfSubmodule = lib.types.submodule {
Expand Down Expand Up @@ -161,7 +167,7 @@ in
default = {
listen_addresses = config.listen_addresses;
port = config.port;
unix_socket_directories = config.dataDir;
unix_socket_directories = config.socketDir;
hba_file = "${config.hbaConfFile}";
};
};
Expand All @@ -181,7 +187,7 @@ in
default = {
listen_addresses = config.listen_addresses;
port = config.port;
unix_socket_directories = lib.mkDefault config.dataDir;
unix_socket_directories = lib.mkDefault config.socketDir;
hba_file = "${config.hbaConfFile}";
};
example = lib.literalExpression ''
Expand Down Expand Up @@ -311,12 +317,13 @@ in
text = ''
set -euo pipefail
PGDATA=$(readlink -f "${config.dataDir}")
PGSOCKETDIR=$(readlink -f "${config.socketDir}")
export PGDATA
postgres -k "$PGDATA"
postgres -k "$PGSOCKETDIR"
'';
};
pg_isreadyArgs = [
"-h $(readlink -f ${config.dataDir})"
"-h $(readlink -f \"${config.socketDir}\")"
"-p ${toString config.port}"
"-d template1"
] ++ (lib.optional (config.superuser != null) "-U ${config.superuser}");
Expand Down
2 changes: 1 addition & 1 deletion nix/postgres/setup-script.nix
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ in
echo
echo "PostgreSQL is setting up the initial database."
echo
PGHOST=$(mktemp -d "$(readlink -f ${config.dataDir})/pg-init-XXXXXX")
PGHOST=$(mkdir -p "${config.socketDir}" && mktemp -d "$(readlink -f "${config.socketDir}")/pg-init-XXXXXX")
export PGHOST
function remove_tmp_pg_init_sock_dir() {
Expand Down

0 comments on commit cb0ae89

Please sign in to comment.