diff options
author | Domen Kožar <domen@dev.si> | 2016-09-21 14:19:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-21 14:19:17 +0200 |
commit | 001d314e874e7fcf819847f88051346684d22e32 (patch) | |
tree | 7767fdeae5dae59a1d593b2ffd3191fb86a68489 /nixos/modules | |
parent | 5bfd092f07aee3c71b603000f13773a739971e72 (diff) | |
parent | 9132088dab08abab9107e285db64f3f8f7dbd7c5 (diff) | |
download | nixlib-001d314e874e7fcf819847f88051346684d22e32.tar nixlib-001d314e874e7fcf819847f88051346684d22e32.tar.gz nixlib-001d314e874e7fcf819847f88051346684d22e32.tar.bz2 nixlib-001d314e874e7fcf819847f88051346684d22e32.tar.lz nixlib-001d314e874e7fcf819847f88051346684d22e32.tar.xz nixlib-001d314e874e7fcf819847f88051346684d22e32.tar.zst nixlib-001d314e874e7fcf819847f88051346684d22e32.zip |
Merge pull request #18574 from ericsagnes/feat/mongodb
MongoDB service: switch configuration format to YAML
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/databases/mongodb.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index ef9bc46e4a0e..38e46a0c6ef9 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -12,13 +12,11 @@ let mongoCnf = pkgs.writeText "mongodb.conf" '' - bind_ip = ${cfg.bind_ip} - ${optionalString cfg.quiet "quiet = true"} - dbpath = ${cfg.dbpath} - syslog = true - fork = true - pidfilepath = ${cfg.pidFile} - ${optionalString (cfg.replSetName != "") "replSet = ${cfg.replSetName}"} + net.bindIp: ${cfg.bind_ip} + ${optionalString cfg.quiet "systemLog.quiet: true"} + systemLog.destination: syslog + storage.dbPath: ${cfg.dbpath} + ${optionalString (cfg.replSetName != "") "replication.replSetName: ${cfg.replSetName}"} ${cfg.extraConfig} ''; @@ -84,9 +82,9 @@ in extraConfig = mkOption { default = ""; example = '' - nojournal = true + storage.journal.enabled: false ''; - description = "MongoDB extra configuration"; + description = "MongoDB extra configuration in YAML format"; }; }; @@ -112,7 +110,7 @@ in after = [ "network.target" ]; serviceConfig = { - ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf}"; + ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}"; User = cfg.user; PIDFile = cfg.pidFile; Type = "forking"; |