Merge pull request #231152 from tcheronneau/nixos.tinyproxy (6843abd5) · Commits · nix / nixpkgs

nixos/modules/module-list.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -1083,6 +1083,7 @@
		./services/networking/thelounge.nix
		./services/networking/tinc.nix
		./services/networking/tinydns.nix
		./services/networking/tinyproxy.nix
		./services/networking/tmate-ssh-server.nix
		./services/networking/tox-bootstrapd.nix
		./services/networking/tox-node.nix

nixos/modules/services/networking/tinyproxy.nix

0 → 100644

+103 −0

Original line number	Diff line number	Diff line
		{ config, lib, pkgs, ... }:

		with lib;

		let
		cfg = config.services.tinyproxy;
		mkValueStringTinyproxy = with lib; v:
		if true == v then "yes"
		else if false == v then "no"
		else generators.mkValueStringDefault {} v;
		mkKeyValueTinyproxy = {
		mkValueString ? mkValueStringDefault {}
		}: sep: k: v:
		if null == v then ""
		else "${lib.strings.escape [sep] k}${sep}${mkValueString v}";

		settingsFormat = (pkgs.formats.keyValue {
		mkKeyValue = mkKeyValueTinyproxy {
		mkValueString = mkValueStringTinyproxy;
		} " ";
		listsAsDuplicateKeys= true;
		});
		configFile = settingsFormat.generate "tinyproxy.conf" cfg.settings;

		in
		{

		options = {
		services.tinyproxy = {
		enable = mkEnableOption (lib.mdDoc "Tinyproxy daemon");
		package = mkPackageOptionMD pkgs "tinyproxy" {};
		settings = mkOption {
		description = lib.mdDoc "Configuration for [tinyproxy](https://tinyproxy.github.io/).";
		default = { };
		example = literalExpression ''{
		Port 8888;
		Listen 127.0.0.1;
		Timeout 600;
		Allow 127.0.0.1;
		Anonymous = ['"Host"' '"Authorization"'];
		ReversePath = '"/example/" "http://www.example.com/"';
		}'';
		type = types.submodule ({name, ...}: {
		freeformType = settingsFormat.type;
		options = {
		Listen = mkOption {
		type = types.str;
		default = "127.0.0.1";
		description = lib.mdDoc ''
		Specify which address to listen to.
		'';
		};
		Port = mkOption {
		type = types.int;
		default = 8888;
		description = lib.mdDoc ''
		Specify which port to listen to.
		'';
		};
		Anonymous = mkOption {
		type = types.listOf types.str;
		default = [];
		description = lib.mdDoc ''
		If an `Anonymous` keyword is present, then anonymous proxying is enabled. The headers listed with `Anonymous` are allowed through, while all others are denied. If no Anonymous keyword is present, then all headers are allowed through. You must include quotes around the headers.
		'';
		};
		Filter = mkOption {
		type = types.nullOr types.path;
		default = null;
		description = lib.mdDoc ''
		Tinyproxy supports filtering of web sites based on URLs or domains. This option specifies the location of the file containing the filter rules, one rule per line.
		'';
		};
		};
		});
		};
		};
		};
		config = mkIf cfg.enable {
		systemd.services.tinyproxy = {
		description = "TinyProxy daemon";
		after = [ "network.target" ];
		wantedBy = [ "multi-user.target" ];
		serviceConfig = {
		User = "tinyproxy";
		Group = "tinyproxy";
		Type = "simple";
		ExecStart = "${getExe pkgs.tinyproxy} -d -c ${configFile}";
		ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
		KillSignal = "SIGINT";
		TimeoutStopSec = "30s";
		Restart = "on-failure";
		};
		};

		users.users.tinyproxy = {
		group = "tinyproxy";
		isSystemUser = true;
		};
		users.groups.tinyproxy = {};
		};
		meta.maintainers = with maintainers; [ tcheronneau ];
		}

nixos/tests/all-tests.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -819,6 +819,7 @@ in {
		timezone = handleTest ./timezone.nix {};
		tinc = handleTest ./tinc {};
		tinydns = handleTest ./tinydns.nix {};
		tinyproxy = handleTest ./tinyproxy.nix {};
		tinywl = handleTest ./tinywl.nix {};
		tmate-ssh-server = handleTest ./tmate-ssh-server.nix { };
		tomcat = handleTest ./tomcat.nix {};

nixos/tests/tinyproxy.nix

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		import ./make-test-python.nix ({ pkgs, ... }: {
		name = "tinyproxy";

		nodes.machine = { config, pkgs, ... }: {
		services.tinyproxy = {
		enable = true;
		settings = {
		Listen = "127.0.0.1";
		Port = 8080;
		};
		};
		};

		testScript = ''
		machine.wait_for_unit("tinyproxy.service")
		machine.wait_for_open_port(8080)

		machine.succeed('curl -s http://localhost:8080 \|grep -i tinyproxy')
		'';
		})

pkgs/tools/networking/tinyproxy/default.nix

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		, fetchpatch
		, autoreconfHook
		, perl
		, nixosTests
		, withDebug ? false
		}:

		@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
		nativeBuildInputs = [ autoreconfHook perl ];

		configureFlags = lib.optionals withDebug [ "--enable-debug" ]; # Enable debugging support code and methods.
		passthru.tests = { inherit (nixosTests) tinyproxy; };

		meta = with lib; {
		homepage = "https://tinyproxy.github.io/";