From ecaefda84a41dead4c1a054dde914cdbbf885667 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 7 Feb 2021 14:11:08 -0800 Subject: [PATCH] nixos.flashpolicyd: drop --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + .../services/networking/flashpolicyd.nix | 86 ------------------- 3 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 nixos/modules/services/networking/flashpolicyd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7a656a58e9c..260ee8d923c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -650,7 +650,6 @@ ./services/networking/fireqos.nix ./services/networking/firewall.nix ./services/networking/flannel.nix - ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix ./services/networking/freeradius.nix ./services/networking/gale.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1dd8b48d76b..2d07e421efe 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -71,6 +71,7 @@ with lib; (mkRemovedOptionModule [ "services" "seeks" ] "") (mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") # Do NOT add any option renames here, see top of the file ]; diff --git a/nixos/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix deleted file mode 100644 index d3ac78430ca..00000000000 --- a/nixos/modules/services/networking/flashpolicyd.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.flashpolicyd; - - flashpolicyd = pkgs.stdenv.mkDerivation { - name = "flashpolicyd-0.6"; - - src = pkgs.fetchurl { - name = "flashpolicyd_v0.6.zip"; - url = "https://download.adobe.com/pub/adobe/devnet/flashplayer/articles/socket_policy_files/flashpolicyd_v0.6.zip"; - sha256 = "16zk237233npwfq1m4ksy4g5lzy1z9fp95w7pz0cdlpmv0fv9sm3"; - }; - - buildInputs = [ pkgs.unzip pkgs.perl ]; - - installPhase = "mkdir $out; cp -pr * $out/; chmod +x $out/*/*.pl"; - }; - - flashpolicydWrapper = pkgs.writeScriptBin "flashpolicyd" - '' - #! ${pkgs.runtimeShell} - exec ${flashpolicyd}/Perl_xinetd/in.flashpolicyd.pl \ - --file=${pkgs.writeText "flashpolixy.xml" cfg.policy} \ - 2> /dev/null - ''; - -in - -{ - - ###### interface - - options = { - - services.flashpolicyd = { - - enable = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to enable the Flash Policy server. This is - necessary if you want Flash applications to make - connections to your server. - ''; - }; - - policy = mkOption { - type = types.lines; - default = - '' - - - - - - - ''; - description = "The policy to be served. The default is to allow connections from any domain to any port."; - }; - - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - services.xinetd.enable = true; - - services.xinetd.services = singleton - { name = "flashpolicy"; - port = 843; - unlisted = true; - server = "${flashpolicydWrapper}/bin/flashpolicyd"; - }; - - }; - -}