diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-03-30 13:45:07 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-03-30 13:45:07 +0200 |
| commit | eac32cf697fa714272044da1b1318df8da8950a8 (patch) | |
| tree | ab614f1ea03047ef64c079bffc51c85a11805bb4 /nixos | |
| parent | 3661c7a8421a57a43a595db50dd7190064da0097 (diff) | |
| download | nixlib-eac32cf697fa714272044da1b1318df8da8950a8.tar nixlib-eac32cf697fa714272044da1b1318df8da8950a8.tar.gz nixlib-eac32cf697fa714272044da1b1318df8da8950a8.tar.bz2 nixlib-eac32cf697fa714272044da1b1318df8da8950a8.tar.lz nixlib-eac32cf697fa714272044da1b1318df8da8950a8.tar.xz nixlib-eac32cf697fa714272044da1b1318df8da8950a8.tar.zst nixlib-eac32cf697fa714272044da1b1318df8da8950a8.zip | |
Revert "Merge pull request #7032 from flosse/change-option-names"
This reverts commit c265aafb555d172baa56e22b2c371d0b6fbe4952, reversing changes made to c9bbf2228f7a71f6bdec51a0c7bbb9ba7206c1ff. Breaks evaluation, see https://github.com/NixOS/nixpkgs/pull/7032#issuecomment-87641471
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/rename.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/networking/prosody.nix | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 840188f89f8e..e820b2cb9ce4 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -122,9 +122,6 @@ in zipModules ([] ++ deprecated [ "kde" "extraPackages" ] [ "environment" "systemPackages" ] ++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ] -# Prosody -++ deprecated [ "services" "prosody" "virtualHosts" "enabled" ] [ "services" "prosody" "virtualHosts" "enable" ] - # Multiple efi bootloaders now ++ obsolete [ "boot" "loader" "efi" "efibootmgr" "enable" ] [ "boot" "loader" "efi" "canTouchEfiVariables" ] diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 4e9199f0fcf3..f82f8bfddbb7 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -113,7 +113,7 @@ let description = "Domain name"; }; - enable = mkOption { + enabled = mkOption { default = false; description = "Whether to enable the virtual host"; }; @@ -169,14 +169,14 @@ in example = { myhost = { domain = "my-xmpp-example-host.org"; - enable = true; + enabled = true; }; }; default = { localhost = { domain = "localhost"; - enable = true; + enabled = true; }; }; @@ -214,6 +214,7 @@ in pidfile = "/var/lib/prosody/prosody.pid" + log = "*syslog" data_path = "/var/lib/prosody" @@ -243,7 +244,7 @@ in ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: '' VirtualHost "${v.domain}" - enabled = ${if v.enable then "true" else "false"}; + enabled = ${if v.enabled then "true" else "false"}; ${ optionalString (v.ssl != null) (createSSLOptsStr v.ssl) } ${ v.extraConfig } '') cfg.virtualHosts) } |