diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-11-24 14:42:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 14:42:46 +0100 |
| commit | 9c8528e0954904ba76f7950e7ebd74210152ad19 (patch) | |
| tree | 277b4734ff53e90211296fdd0bc5955f8a3944c2 | |
| parent | 27421fc6f03b39d851d07ecd1a959647eeba7a67 (diff) | |
| parent | 3ea442ca94d91afd355dbdadece457ecb1ff9276 (diff) | |
| download | nixpkgs-9c8528e0954904ba76f7950e7ebd74210152ad19.tar nixpkgs-9c8528e0954904ba76f7950e7ebd74210152ad19.tar.gz nixpkgs-9c8528e0954904ba76f7950e7ebd74210152ad19.tar.bz2 nixpkgs-9c8528e0954904ba76f7950e7ebd74210152ad19.tar.lz nixpkgs-9c8528e0954904ba76f7950e7ebd74210152ad19.tar.xz nixpkgs-9c8528e0954904ba76f7950e7ebd74210152ad19.tar.zst nixpkgs-9c8528e0954904ba76f7950e7ebd74210152ad19.zip | |
Merge pull request #74035 from ckauhaus/remove-vpnc
networking.vpnc: remove option
| -rw-r--r-- | nixos/modules/config/vpnc.nix | 41 | ||||
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/rename.nix | 1 |
3 files changed, 1 insertions, 42 deletions
diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix deleted file mode 100644 index 356e007c0a3..00000000000 --- a/nixos/modules/config/vpnc.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, lib, ... }: - -with lib; - -let - cfg = config.networking.vpnc; - mkServiceDef = name: value: - { - name = "vpnc/${name}.conf"; - value = { text = value; }; - }; - -in -{ - options = { - networking.vpnc = { - services = mkOption { - type = types.attrsOf types.str; - default = {}; - example = literalExample '' - { test = ''' - IPSec gateway 192.168.1.1 - IPSec ID someID - IPSec secret secretKey - Xauth username name - Xauth password pass - '''; - } - ''; - description = - '' - The names of cisco VPNs and their associated definitions - ''; - }; - }; - }; - - config.environment.etc = mapAttrs' mkServiceDef cfg.services; -} - - diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6b578cd5619..5f4a608d74d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -35,7 +35,6 @@ ./config/terminfo.nix ./config/unix-odbc-drivers.nix ./config/users-groups.nix - ./config/vpnc.nix ./config/vte.nix ./config/zram.nix ./hardware/acpilight.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 7d8cf55b827..a109b26a5f3 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -235,6 +235,7 @@ with lib; (mkRemovedOptionModule [ "services" "zabbixServer" "dbPassword" ] "Use services.zabbixServer.database.passwordFile instead.") (mkRemovedOptionModule [ "systemd" "generator-packages" ] "Use systemd.packages instead.") (mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.") + (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) |