diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index e820b2cb9ce4..840188f89f8e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -122,6 +122,9 @@ 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 f82f8bfddbb7..4e9199f0fcf3 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -113,7 +113,7 @@ let description = "Domain name"; }; - enabled = mkOption { + enable = mkOption { default = false; description = "Whether to enable the virtual host"; }; @@ -169,14 +169,14 @@ in example = { myhost = { domain = "my-xmpp-example-host.org"; - enabled = true; + enable = true; }; }; default = { localhost = { domain = "localhost"; - enabled = true; + enable = true; }; }; @@ -214,7 +214,6 @@ in pidfile = "/var/lib/prosody/prosody.pid" - log = "*syslog" data_path = "/var/lib/prosody" @@ -244,7 +243,7 @@ in ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: '' VirtualHost "${v.domain}" - enabled = ${if v.enabled then "true" else "false"}; + enabled = ${if v.enable then "true" else "false"}; ${ optionalString (v.ssl != null) (createSSLOptsStr v.ssl) } ${ v.extraConfig } '') cfg.virtualHosts) }