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

shorewall: fix RestartTriggers

This commit is contained in:
Julien Moutinho 2020-03-04 23:44:35 +01:00
parent ef34994d9a
commit 47f27938e7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/networking/shorewall.nix
View File

@ -26,13 +26,14 @@ in {
description = "The shorewall package to use."; description = "The shorewall package to use.";
}; };
configs = lib.mkOption { configs = lib.mkOption {
type = types.attrsOf types.str; type = types.attrsOf types.lines;
default = {}; default = {};
description = '' description = ''
This option defines the Shorewall configs. This option defines the Shorewall configs.
The attribute name defines the name of the config, The attribute name defines the name of the config,
and the attribute value defines the content 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 = { environment = {
etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {text=conf;}) cfg.configs; etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {source=conf;}) cfg.configs;
systemPackages = [ cfg.package ]; systemPackages = [ cfg.package ];
}; };
}; };

5
nixos/modules/services/networking/shorewall6.nix
View File

@ -26,13 +26,14 @@ in {
description = "The shorewall package to use."; description = "The shorewall package to use.";
}; };
configs = lib.mkOption { configs = lib.mkOption {
type = types.attrsOf types.str; type = types.attrsOf types.lines;
default = {}; default = {};
description = '' description = ''
This option defines the Shorewall configs. This option defines the Shorewall configs.
The attribute name defines the name of the config, The attribute name defines the name of the config,
and the attribute value defines the content 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 = { 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 ]; systemPackages = [ cfg.package ];
}; };
}; };