diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2019-12-10 02:51:19 +0100 |
|---|---|---|
| committer | Silvan Mosberger <contact@infinisil.com> | 2019-12-10 02:51:19 +0100 |
| commit | 4ee3e8b21dfeaf236b86a0c109953dd809a77e64 (patch) | |
| tree | 79bf61d3635aa336cd88d215470be66f489cc267 /nixos/modules/services/security/tor.nix | |
| parent | cd9ace689274fedd7e95dabdc99041d4c799c3dc (diff) | |
| download | nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.gz nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.bz2 nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.lz nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.xz nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.zst nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.zip | |
nixos/treewide: Move rename.nix imports to their respective modules
A centralized list for these renames is not good because: - It breaks disabledModules for modules that have a rename defined - Adding/removing renames for a module means having to find them in the central file - Merge conflicts due to multiple people editing the central file
Diffstat (limited to 'nixos/modules/services/security/tor.nix')
| -rw-r--r-- | nixos/modules/services/security/tor.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index ed862387cce..18c105b2f57 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -106,6 +106,12 @@ let in { + imports = [ + (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ]) + (mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.") + (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.") + ]; + options = { services.tor = { enable = mkOption { |