public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strongswan-swanctl: disable the structured strongswan config for now in favour of a literal config

Browse Source 
This reduces the number of option by over 600.
This commit is contained in:
Bas van Dijk 2018-02-28 11:44:22 +01:00
parent ee95cb8169
commit 018f66020f
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/modules/services/networking/strongswan-swanctl/module.nix
View File

@ -9,7 +9,7 @@ let
# TODO: auto-generate these files using: # TODO: auto-generate these files using:
# https://github.com/strongswan/strongswan/tree/master/conf # https://github.com/strongswan/strongswan/tree/master/conf
# IDEA: extend the format-options.py script to output these Nix files. # 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; swanctlParams = import ./swanctl-params.nix lib;
in { in {
options.services.strongswan-swanctl = { 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; swanctl = paramsToOptions swanctlParams;
}; };
@ -65,7 +76,8 @@ in {
path = with pkgs; [ kmod iproute iptables utillinux ]; path = with pkgs; [ kmod iproute iptables utillinux ];
environment.STRONGSWAN_CONF = pkgs.writeTextFile { environment.STRONGSWAN_CONF = pkgs.writeTextFile {
name = "strongswan.conf"; 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 ]; restartTriggers = [ config.environment.etc."swanctl/swanctl.conf".source ];
serviceConfig = { serviceConfig = {