diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2016-01-12 17:12:47 +0000 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2016-01-12 17:12:47 +0000 |
| commit | 23772ef0a26fe631cde87690ecc586c598e2f3d9 (patch) | |
| tree | 4ca9d3a4c5df4efe7ed1e1f64bf3988ff2bfc20f | |
| parent | e8a66aa4f3a3dc873596148c7cacd2f1c77dd131 (diff) | |
| download | nixpkgs-23772ef0a26fe631cde87690ecc586c598e2f3d9.tar nixpkgs-23772ef0a26fe631cde87690ecc586c598e2f3d9.tar.gz nixpkgs-23772ef0a26fe631cde87690ecc586c598e2f3d9.tar.bz2 nixpkgs-23772ef0a26fe631cde87690ecc586c598e2f3d9.tar.lz nixpkgs-23772ef0a26fe631cde87690ecc586c598e2f3d9.tar.xz nixpkgs-23772ef0a26fe631cde87690ecc586c598e2f3d9.tar.zst nixpkgs-23772ef0a26fe631cde87690ecc586c598e2f3d9.zip | |
ejabberd: make config parameter nullable, so that the default bundled config can be used if none is given
| -rw-r--r-- | nixos/modules/services/networking/ejabberd.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix index a990200f44c..7af11f37a43 100644 --- a/nixos/modules/services/networking/ejabberd.nix +++ b/nixos/modules/services/networking/ejabberd.nix @@ -11,7 +11,7 @@ let ${cfg.ctlConfig} ''; - ectl = ''${cfg.package}/bin/ejabberdctl --config "${cfg.configFile}" --ctl-config "${ctlcfg}" --spool "${cfg.spoolDir}" --logs "${cfg.logsDir}"''; + ectl = ''${cfg.package}/bin/ejabberdctl ${if cfg.configFile == null then "" else "--config ${cfg.configFile}"} --ctl-config "${ctlcfg}" --spool "${cfg.spoolDir}" --logs "${cfg.logsDir}"''; dumps = lib.concatMapStringsSep " " lib.escapeShellArg cfg.loadDumps; @@ -60,8 +60,9 @@ in { }; configFile = mkOption { - type = types.path; + type = types.nullOr types.path; description = "Configuration file for ejabberd in YAML format"; + default = null; }; ctlConfig = mkOption { |