diff options
Diffstat (limited to 'nixos/modules/rename.nix')
| -rw-r--r-- | nixos/modules/rename.nix | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 3caac6c4ee60..412cccc20d58 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -29,7 +29,7 @@ with lib; (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ]) (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ]) - (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ]) + (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "") # Old Grub-related options. (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]) @@ -112,27 +112,27 @@ with lib; (mkRenamedOptionModule [ "services" "iodined" "domain" ] [ "services" "iodine" "server" "domain" ]) (mkRenamedOptionModule [ "services" "iodined" "ip" ] [ "services" "iodine" "server" "ip" ]) (mkRenamedOptionModule [ "services" "iodined" "extraConfig" ] [ "services" "iodine" "server" "extraConfig" ]) - (mkRemovedOptionModule [ "services" "iodined" "client" ]) + (mkRemovedOptionModule [ "services" "iodined" "client" ] "") # Grsecurity - (mkRemovedOptionModule [ "security" "grsecurity" "kernelPatch" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "mode" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "priority" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "system" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "virtualisationConfig" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "hardwareVirtualisation" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "virtualisationSoftware" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "sysctl" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyChrootChmod" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyChrootCaps" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyUSB" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "restrictProc" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "restrictProcWithGroup" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "unrestrictProcGid" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "disableRBAC" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "disableSimultConnect" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "verboseVersion" ]) - (mkRemovedOptionModule [ "security" "grsecurity" "config" "kernelExtraConfig" ]) + (mkRemovedOptionModule [ "security" "grsecurity" "kernelPatch" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "mode" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "priority" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "system" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "virtualisationConfig" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "hardwareVirtualisation" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "virtualisationSoftware" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "sysctl" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyChrootChmod" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyChrootCaps" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyUSB" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "restrictProc" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "restrictProcWithGroup" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "unrestrictProcGid" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "disableRBAC" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "disableSimultConnect" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "verboseVersion" ] "") + (mkRemovedOptionModule [ "security" "grsecurity" "config" "kernelExtraConfig" ] "") # Unity3D (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ]) @@ -141,18 +141,18 @@ with lib; (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "rendering" ] [ "fonts" "fontconfig" "ultimate" "preset" ]) # Options that are obsolete and have no replacement. - (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ]) - (mkRemovedOptionModule [ "programs" "bash" "enable" ]) - (mkRemovedOptionModule [ "services" "samba" "defaultShare" ]) - (mkRemovedOptionModule [ "services" "syslog-ng" "serviceName" ]) - (mkRemovedOptionModule [ "services" "syslog-ng" "listenToJournal" ]) - (mkRemovedOptionModule [ "ec2" "metadata" ]) - (mkRemovedOptionModule [ "services" "openvpn" "enable" ]) - (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ]) - (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ]) - (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ]) - (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ]) - (mkRemovedOptionModule [ "services" "dovecot2" "package" ]) - + (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") + (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") + (mkRemovedOptionModule [ "services" "samba" "defaultShare" ] "") + (mkRemovedOptionModule [ "services" "syslog-ng" "serviceName" ] "") + (mkRemovedOptionModule [ "services" "syslog-ng" "listenToJournal" ] "") + (mkRemovedOptionModule [ "ec2" "metadata" ] "") + (mkRemovedOptionModule [ "services" "openvpn" "enable" ] "") + (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "") + (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "") + (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ] + "See the 16.03 release notes for more information.") + (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "") + (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "") ]; } |