diff options
| author | Peter Hoeg <peter@hoeg.com> | 2017-10-14 14:40:53 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2017-10-14 14:42:48 +0800 |
| commit | 8df1c9ac175d72c0c18ede3d22764ece9dceeeef (patch) | |
| tree | 22172ab9183428b2d9ec98f523e6b5c2e246213d /nixos | |
| parent | 56db212f2143e6f3dfbb83425ac389feb333b13c (diff) | |
| download | nixlib-8df1c9ac175d72c0c18ede3d22764ece9dceeeef.tar nixlib-8df1c9ac175d72c0c18ede3d22764ece9dceeeef.tar.gz nixlib-8df1c9ac175d72c0c18ede3d22764ece9dceeeef.tar.bz2 nixlib-8df1c9ac175d72c0c18ede3d22764ece9dceeeef.tar.lz nixlib-8df1c9ac175d72c0c18ede3d22764ece9dceeeef.tar.xz nixlib-8df1c9ac175d72c0c18ede3d22764ece9dceeeef.tar.zst nixlib-8df1c9ac175d72c0c18ede3d22764ece9dceeeef.zip | |
Revert "firewalld: init at 0.4.4.4"
This reverts commit 178a96f99be69a173669254295d5a06732e7a906.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/networking/firewalld.nix | 53 |
2 files changed, 0 insertions, 54 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1eef781a31df..5e6b42dea543 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -437,7 +437,6 @@ ./services/networking/firefox/sync-server.nix ./services/networking/fireqos.nix ./services/networking/firewall.nix - ./services/networking/firewalld.nix ./services/networking/flannel.nix ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix diff --git a/nixos/modules/services/networking/firewalld.nix b/nixos/modules/services/networking/firewalld.nix deleted file mode 100644 index 02d694af3907..000000000000 --- a/nixos/modules/services/networking/firewalld.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.networking.firewalld; - -in { - ###### interface - - options = { - networking.firewalld = { - enable = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to enable firewalld. firewalld is a high-level Linux-based packet - filtering framework intended for desktop use cases. - - This conflicts with the standard networking firewall, so make sure to - disable it before using firewalld. - ''; - }; - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - assertions = [{ - assertion = config.networking.firewall.enable == false; - message = "You can not use firewalld with services.networking.firewall."; - }]; - - environment.etc = [ - { source = "${pkgs.firewalld}/etc/firewalld"; - target = "firewalld"; } - ]; - - services = { - dbus.packages = with pkgs; [ firewalld ]; - }; - - systemd = { - packages = with pkgs; [ firewalld ]; - - services.firewalld = { - wantedBy = [ "multi-user.target" ]; - }; - }; - }; -} |