about summary refs log tree commit diff
path: root/nixos/modules/services/databases
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-09-06 03:20:09 +0200
committerJan Tojnar <jtojnar@gmail.com>2019-09-06 03:20:09 +0200
commitcdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (patch)
tree3fdd8ed1c086fb0ddf93941114bb1cbbb4659af9 /nixos/modules/services/databases
parente7cccdbb139ccf2f9f170500f40c04a6237a2da1 (diff)
parented54a5b51dc9542df94f70b25a13d86d1f494e64 (diff)
downloadnixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar
nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.gz
nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.bz2
nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.lz
nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.xz
nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.zst
nixlib-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.zip
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
Diffstat (limited to 'nixos/modules/services/databases')
-rw-r--r--nixos/modules/services/databases/postgresql.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 10250bb5193a..1ed4d3290ced 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -81,6 +81,10 @@ in
         default = "";
         description = ''
           Defines the mapping from system users to database users.
+
+          The general form is:
+
+          map-name system-username database-username
         '';
       };