summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-11-27 12:36:32 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-11-27 17:09:17 +0100
commitc6529ac9eb03145449d0d8af4aa1123935a88a1a (patch)
tree6b85a565354075cbdcd8a1e3f54aa8ebcec6f8b5
parent469ce846c34acb34d06a36bf33bf9b95e36cf591 (diff)
downloadnixpkgs-c6529ac9eb03145449d0d8af4aa1123935a88a1a.tar
nixpkgs-c6529ac9eb03145449d0d8af4aa1123935a88a1a.tar.gz
nixpkgs-c6529ac9eb03145449d0d8af4aa1123935a88a1a.tar.bz2
nixpkgs-c6529ac9eb03145449d0d8af4aa1123935a88a1a.tar.lz
nixpkgs-c6529ac9eb03145449d0d8af4aa1123935a88a1a.tar.xz
nixpkgs-c6529ac9eb03145449d0d8af4aa1123935a88a1a.tar.zst
nixpkgs-c6529ac9eb03145449d0d8af4aa1123935a88a1a.zip
postgresql: Fix the port option
Also clarify the description of the enableTCPIP option.
-rw-r--r--nixos/modules/services/databases/postgresql.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index a1ab1c92b8f..d99ad2c9c7c 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -30,6 +30,7 @@ let
       hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}'
       ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}'
       log_destination = 'stderr'
+      port = ${toString cfg.port}
       ${cfg.extraConfig}
     '';
 
@@ -63,9 +64,9 @@ in
 
       port = mkOption {
         type = types.int;
-        default = "5432";
+        default = 5432;
         description = ''
-          Port for PostgreSQL.
+          The port on which PostgreSQL listens.
         '';
       };
 
@@ -105,7 +106,9 @@ in
         type = types.bool;
         default = false;
         description = ''
-          Whether to run PostgreSQL with -i flag to enable TCP/IP connections.
+          Whether PostgreSQL should listen on all network interfaces.
+          If disabled, the database can only be accessed via its Unix
+          domain socket or via TCP connections to localhost.
         '';
       };