diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index fcdffc520967..ebd53cb17ea5 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -167,7 +167,7 @@ in nsd = 126; gitolite = 127; znc = 128; - polipo = 129; + # polipo = 129; removed 2025-05-18 mopidy = 130; #docker = 131; # unused gdm = 132; @@ -507,7 +507,7 @@ in nsd = 126; gitolite = 127; znc = 128; - polipo = 129; + # polipo = 129; removed 2025-05-18 mopidy = 130; docker = 131; gdm = 132; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 283d022293c5..ddf258c61a14 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1268,7 +1268,6 @@ ./services/networking/picosnitch.nix ./services/networking/pixiecore.nix ./services/networking/pleroma.nix - ./services/networking/polipo.nix ./services/networking/powerdns.nix ./services/networking/pppd.nix ./services/networking/pptpd.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 94cf7428e09d..01d439478a6c 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -193,6 +193,9 @@ in (mkRemovedOptionModule [ "services" "pantheon" "files" ] '' This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly. '') + (mkRemovedOptionModule [ "services" "polipo" ] '' + The polipo project is unmaintained and archived upstream. + '') (mkRemovedOptionModule [ "services" "prey" ] '' prey-bash-client is deprecated upstream '') diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix deleted file mode 100644 index 67f83358312e..000000000000 --- a/nixos/modules/services/networking/polipo.nix +++ /dev/null @@ -1,124 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - - cfg = config.services.polipo; - - polipoConfig = pkgs.writeText "polipo.conf" '' - proxyAddress = ${cfg.proxyAddress} - proxyPort = ${toString cfg.proxyPort} - allowedClients = ${concatStringsSep ", " cfg.allowedClients} - ${optionalString (cfg.parentProxy != "") "parentProxy = ${cfg.parentProxy}"} - ${optionalString (cfg.socksParentProxy != "") "socksParentProxy = ${cfg.socksParentProxy}"} - ${config.services.polipo.extraConfig} - ''; - -in - -{ - - options = { - - services.polipo = { - - enable = mkEnableOption "polipo caching web proxy"; - - proxyAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "IP address on which Polipo will listen."; - }; - - proxyPort = mkOption { - type = types.port; - default = 8123; - description = "TCP port on which Polipo will listen."; - }; - - allowedClients = mkOption { - type = types.listOf types.str; - default = [ - "127.0.0.1" - "::1" - ]; - example = [ - "127.0.0.1" - "::1" - "134.157.168.0/24" - "2001:660:116::/48" - ]; - description = '' - List of IP addresses or network addresses that may connect to Polipo. - ''; - }; - - parentProxy = mkOption { - type = types.str; - default = ""; - example = "localhost:8124"; - description = '' - Hostname and port number of an HTTP parent proxy; - it should have the form ‘host:port’. - ''; - }; - - socksParentProxy = mkOption { - type = types.str; - default = ""; - example = "localhost:9050"; - description = '' - Hostname and port number of an SOCKS parent proxy; - it should have the form ‘host:port’. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Polio configuration. Contents will be added - verbatim to the configuration file. - ''; - }; - - }; - - }; - - config = mkIf cfg.enable { - - users.users.polipo = { - uid = config.ids.uids.polipo; - description = "Polipo caching proxy user"; - home = "/var/cache/polipo"; - createHome = true; - }; - - users.groups.polipo = { - gid = config.ids.gids.polipo; - members = [ "polipo" ]; - }; - - systemd.services.polipo = { - description = "caching web proxy"; - after = [ - "network.target" - "nss-lookup.target" - ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.polipo}/bin/polipo -c ${polipoConfig}"; - User = "polipo"; - }; - }; - - }; - -}