diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-02-28 11:44:22 +0100 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-02-28 11:44:22 +0100 |
commit | 018f66020fe1b5d13643521a5087bae8a4c26010 (patch) | |
tree | 8de95e91d4374caf54235d5f1743db67c9348f31 /nixos | |
parent | ee95cb8169a5435b860301ecd02510be4b20a525 (diff) | |
download | nixpkgs-018f66020fe1b5d13643521a5087bae8a4c26010.tar nixpkgs-018f66020fe1b5d13643521a5087bae8a4c26010.tar.gz nixpkgs-018f66020fe1b5d13643521a5087bae8a4c26010.tar.bz2 nixpkgs-018f66020fe1b5d13643521a5087bae8a4c26010.tar.lz nixpkgs-018f66020fe1b5d13643521a5087bae8a4c26010.tar.xz nixpkgs-018f66020fe1b5d13643521a5087bae8a4c26010.tar.zst nixpkgs-018f66020fe1b5d13643521a5087bae8a4c26010.zip |
strongswan-swanctl: disable the structured strongswan config for now in favour of a literal config
This reduces the number of option by over 600.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/networking/strongswan-swanctl/module.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix index 8bfb62e6b03..30d039a2b7a 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/module.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -9,7 +9,7 @@ let # TODO: auto-generate these files using: # https://github.com/strongswan/strongswan/tree/master/conf # IDEA: extend the format-options.py script to output these Nix files. - strongswanParams = import ./strongswan-params.nix lib; + #strongswanParams = import ./strongswan-params.nix lib; swanctlParams = import ./swanctl-params.nix lib; in { options.services.strongswan-swanctl = { @@ -24,7 +24,18 @@ in { ''; }; - strongswan = paramsToOptions strongswanParams; + strongswan.extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Contents of the <literal>strongswan.conf</literal> file. + ''; + }; + + # The structured strongswan configuration is commented out for + # now in favour of the literal config above. We should first + # discus if we want to add the 600+ options by default. + #strongswan = paramsToOptions strongswanParams; swanctl = paramsToOptions swanctlParams; }; @@ -65,7 +76,8 @@ in { path = with pkgs; [ kmod iproute iptables utillinux ]; environment.STRONGSWAN_CONF = pkgs.writeTextFile { name = "strongswan.conf"; - text = paramsToConf cfg.strongswan strongswanParams; + #text = paramsToConf cfg.strongswan strongswanParams; + text = cfg.strongswan.extraConfig; }; restartTriggers = [ config.environment.etc."swanctl/swanctl.conf".source ]; serviceConfig = { |