diff options
author | Julien Moutinho <julm+nix@sourcephile.fr> | 2020-03-04 23:44:35 +0100 |
---|---|---|
committer | Julien Moutinho <julm+nix@sourcephile.fr> | 2020-03-05 00:01:44 +0100 |
commit | 47f27938e75eecf31621e4ada1c65e5c9d4bf244 (patch) | |
tree | 0b419748f8960c3bd74432bd53b834ad45d585ba /nixos/modules/services/networking/shorewall6.nix | |
parent | ef34994d9a4407954c2207b3e72cb3a16fc9be56 (diff) | |
download | nixpkgs-47f27938e75eecf31621e4ada1c65e5c9d4bf244.tar nixpkgs-47f27938e75eecf31621e4ada1c65e5c9d4bf244.tar.gz nixpkgs-47f27938e75eecf31621e4ada1c65e5c9d4bf244.tar.bz2 nixpkgs-47f27938e75eecf31621e4ada1c65e5c9d4bf244.tar.lz nixpkgs-47f27938e75eecf31621e4ada1c65e5c9d4bf244.tar.xz nixpkgs-47f27938e75eecf31621e4ada1c65e5c9d4bf244.tar.zst nixpkgs-47f27938e75eecf31621e4ada1c65e5c9d4bf244.zip |
shorewall: fix RestartTriggers
Diffstat (limited to 'nixos/modules/services/networking/shorewall6.nix')
-rw-r--r-- | nixos/modules/services/networking/shorewall6.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/shorewall6.nix b/nixos/modules/services/networking/shorewall6.nix index 374e407cc7a..e081aedc6c3 100644 --- a/nixos/modules/services/networking/shorewall6.nix +++ b/nixos/modules/services/networking/shorewall6.nix @@ -26,13 +26,14 @@ in { description = "The shorewall package to use."; }; configs = lib.mkOption { - type = types.attrsOf types.str; + type = types.attrsOf types.lines; default = {}; description = '' This option defines the Shorewall configs. The attribute name defines the name of the config, and the attribute value defines the content of the config. ''; + apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text); }; }; }; @@ -62,7 +63,7 @@ in { ''; }; environment = { - etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {text=conf;}) cfg.configs; + etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {source=conf;}) cfg.configs; systemPackages = [ cfg.package ]; }; }; |