Revert "Merge pull request #7032 from flosse/change-option-names"
This reverts commitc265aafb55
, reversing changes made toc9bbf2228f
. Breaks evaluation, see https://github.com/NixOS/nixpkgs/pull/7032#issuecomment-87641471
This commit is contained in:
parent
3661c7a842
commit
eac32cf697
|
@ -122,9 +122,6 @@ in zipModules ([]
|
||||||
++ deprecated [ "kde" "extraPackages" ] [ "environment" "systemPackages" ]
|
++ deprecated [ "kde" "extraPackages" ] [ "environment" "systemPackages" ]
|
||||||
++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ]
|
++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ]
|
||||||
|
|
||||||
# Prosody
|
|
||||||
++ deprecated [ "services" "prosody" "virtualHosts" "enabled" ] [ "services" "prosody" "virtualHosts" "enable" ]
|
|
||||||
|
|
||||||
# Multiple efi bootloaders now
|
# Multiple efi bootloaders now
|
||||||
++ obsolete [ "boot" "loader" "efi" "efibootmgr" "enable" ] [ "boot" "loader" "efi" "canTouchEfiVariables" ]
|
++ obsolete [ "boot" "loader" "efi" "efibootmgr" "enable" ] [ "boot" "loader" "efi" "canTouchEfiVariables" ]
|
||||||
|
|
||||||
|
|
|
@ -113,7 +113,7 @@ let
|
||||||
description = "Domain name";
|
description = "Domain name";
|
||||||
};
|
};
|
||||||
|
|
||||||
enable = mkOption {
|
enabled = mkOption {
|
||||||
default = false;
|
default = false;
|
||||||
description = "Whether to enable the virtual host";
|
description = "Whether to enable the virtual host";
|
||||||
};
|
};
|
||||||
|
@ -169,14 +169,14 @@ in
|
||||||
example = {
|
example = {
|
||||||
myhost = {
|
myhost = {
|
||||||
domain = "my-xmpp-example-host.org";
|
domain = "my-xmpp-example-host.org";
|
||||||
enable = true;
|
enabled = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
default = {
|
default = {
|
||||||
localhost = {
|
localhost = {
|
||||||
domain = "localhost";
|
domain = "localhost";
|
||||||
enable = true;
|
enabled = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -214,6 +214,7 @@ in
|
||||||
|
|
||||||
pidfile = "/var/lib/prosody/prosody.pid"
|
pidfile = "/var/lib/prosody/prosody.pid"
|
||||||
|
|
||||||
|
|
||||||
log = "*syslog"
|
log = "*syslog"
|
||||||
|
|
||||||
data_path = "/var/lib/prosody"
|
data_path = "/var/lib/prosody"
|
||||||
|
@ -243,7 +244,7 @@ in
|
||||||
|
|
||||||
${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: ''
|
${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: ''
|
||||||
VirtualHost "${v.domain}"
|
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) }
|
${ optionalString (v.ssl != null) (createSSLOptsStr v.ssl) }
|
||||||
${ v.extraConfig }
|
${ v.extraConfig }
|
||||||
'') cfg.virtualHosts) }
|
'') cfg.virtualHosts) }
|
||||||
|
|
Loading…
Reference in a new issue