Merge pull request #38303 from LumiGuide/fix-pgmanage-sql_root

pgmanage: the data_root option is renamed to sql_root
This commit is contained in:
Matthew Justin Bauer 2018-04-17 10:08:15 -05:00 committed by GitHub
commit 12ce909ac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -22,7 +22,7 @@ let
web_root = ${cfg.package}/etc/pgmanage/web_root web_root = ${cfg.package}/etc/pgmanage/web_root
data_root = ${cfg.dataRoot} sql_root = ${cfg.sqlRoot}
${optionalString (!isNull cfg.tls) '' ${optionalString (!isNull cfg.tls) ''
tls_cert = ${cfg.tls.cert} tls_cert = ${cfg.tls.cert}
@ -130,7 +130,7 @@ let
''; '';
}; };
dataRoot = mkOption { sqlRoot = mkOption {
type = types.str; type = types.str;
default = "/var/lib/pgmanage"; default = "/var/lib/pgmanage";
description = '' description = ''
@ -210,7 +210,7 @@ in {
users."${pgmanage}" = { users."${pgmanage}" = {
name = pgmanage; name = pgmanage;
group = pgmanage; group = pgmanage;
home = cfg.dataRoot; home = cfg.sqlRoot;
createHome = true; createHome = true;
}; };
groups."${pgmanage}" = { groups."${pgmanage}" = {