Merge master into staging-nixos (d444bfb1) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+10 −0

Original line number	Diff line number	Diff line
		@@ -10579,6 +10579,11 @@
		githubId = 982322;
		name = "Henrik Olsson";
		};
		henrikvtcodes = {
		github = "henrikvtcodes";
		githubId = 22358337;
		name = "Henrik VT";
		};
		henrirosten = {
		email = "henri.rosten@unikie.com";
		github = "henrirosten";
		@@ -11985,6 +11990,11 @@
		github = "jaredmontoya";
		githubId = 49511278;
		};
		jasanfarah = {
		github = "jasanfarah";
		githubId = 69898185;
		name = "Jasan Farah";
		};
		jasoncarr = {
		email = "jcarr250@gmail.com";
		github = "jasoncarr0";

nixos/modules/module-list.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -1780,6 +1780,7 @@
		./services/web-apps/vikunja.nix
		./services/web-apps/wakapi.nix
		./services/web-apps/weblate.nix
		./services/web-apps/websurfx.nix
		./services/web-apps/whitebophir.nix
		./services/web-apps/whoami.nix
		./services/web-apps/wiki-js.nix

nixos/modules/services/misc/calibre-server.nix

+14 −14

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		config,
		lib,
		pkgs,
		utils,
		...
		}:
		let
		@@ -11,20 +12,17 @@ let
		documentationLink = "https://manual.calibre-ebook.com";
		generatedDocumentationLink = documentationLink + "/generated/en/calibre-server.html";

		execFlags = (
		lib.concatStringsSep " " (
		lib.mapAttrsToList (k: v: "${k} ${toString v}") (
		execFlags =
		lib.mapAttrsToList (k: v: "--${k}=${toString v}") (
		lib.filterAttrs (name: value: value != null) {
		"--listen-on" = cfg.host;
		"--port" = cfg.port;
		"--auth-mode" = cfg.auth.mode;
		"--userdb" = cfg.auth.userDb;
		listen-on = cfg.host;
		port = cfg.port;
		auth-mode = cfg.auth.mode;
		userdb = cfg.auth.userDb;
		}
		)
		++ [ (lib.optionalString (cfg.auth.enable == true) "--enable-auth") ]
		++ cfg.extraFlags
		)
		);
		++ lib.optional cfg.auth.enable "--enable-auth"
		++ cfg.extraFlags;
		in

		{
		@@ -150,7 +148,9 @@ in
		serviceConfig = {
		User = cfg.user;
		Restart = "always";
		ExecStart = "${cfg.package}/bin/calibre-server ${lib.concatStringsSep " " cfg.libraries} ${execFlags}";
		ExecStart = utils.escapeSystemdExecArgs (
		[ "${cfg.package}/bin/calibre-server" ] ++ execFlags ++ [ "--" ] ++ cfg.libraries
		);
		};

		};

nixos/modules/services/misc/paperless.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -485,6 +485,7 @@ in
		PrivateNetwork = cfg.database.createLocally; # defaultServiceConfig enables this by default, needs to be disabled for remote DBs
		};
		environment = env;
		unitConfig.RequiresMountsFor = defaultServiceConfig.ReadWritePaths;

		preStart = ''
		# remove old papaerless-manage symlink

nixos/modules/services/web-apps/websurfx.nix

0 → 100644

+115 −0

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

		let
		cfg = config.services.websurfx;
		settingsFormat = pkgs.formats.lua { asBindings = true; };
		settingsFile = settingsFormat.generate "config.lua" cfg.settings;
		in
		{
		options = {
		services.websurfx = {
		enable = lib.mkEnableOption "Websurfx, a metasearch engine";
		package = lib.mkPackageOption pkgs "websurfx" { };
		openFirewall = lib.mkEnableOption "Whether to open the used port in the firewall";
		settings = lib.mkOption {
		type = lib.types.submodule {
		freeformType = settingsFormat.type;

		options.binding_ip = lib.mkOption {
		type = lib.types.str;
		default = "127.0.0.1";
		description = "IP address on which the server should be launched";
		};
		options.port = lib.mkOption {
		type = lib.types.port;
		default = 4567;
		description = "Port on which the server should be launched";
		};
		};
		default = { };
		description = ''
		Configuration options for Websurfx, see
		[websurfx/config.lua](https://github.com/neon-mmd/websurfx/blob/rolling/websurfx/config.lua)
		for supported values.
		'';
		};
		};
		};

		config = lib.mkIf cfg.enable {
		services.websurfx.settings = {
		# General
		logging = lib.mkDefault true;
		debug = lib.mkDefault false;
		threads = lib.mkDefault 10;

		# Server
		production_use = lib.mkDefault false;
		request_timeout = lib.mkDefault 30;
		tcp_connection_keep_alive = lib.mkDefault 30;
		pool_idle_connection_timeout = lib.mkDefault 30;
		rate_limiter = {
		number_of_requests = lib.mkDefault 20;
		time_limit = lib.mkDefault 3;
		};
		https_adaptive_window_size = lib.mkDefault true;

		operating_system_tls_certificates = lib.mkDefault true;

		number_of_https_connections = lib.mkDefault 10;
		client_connection_keep_alive = lib.mkDefault 120;

		# Search
		safe_search = lib.mkDefault 2;

		# Website
		colorscheme = lib.mkDefault "catppuccin-mocha";
		theme = lib.mkDefault "simple";
		animation = lib.mkDefault "simple-frosted-glow";

		# Caching
		#redis_url = "redis://127.0.0.1:8082"; # The nixpkgs build doesn't have the redis-cache feature enabled
		cache_expiry_time = lib.mkDefault 600;

		# Search Engines
		upstream_search_engines = {
		DuckDuckGo = lib.mkDefault true;
		Searx = lib.mkDefault false;
		Brave = lib.mkDefault false;
		Startpage = lib.mkDefault false;
		LibreX = lib.mkDefault false;
		Mojeek = lib.mkDefault false;
		Bing = lib.mkDefault false;
		Wikipedia = lib.mkDefault true;
		Yahoo = lib.mkDefault false;
		};

		proxy = lib.mkDefault null;
		};

		networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.port ];

		systemd.services.websurfx = {
		description = "Websurfx, a metasearch engine";

		serviceConfig = {
		ExecStart = lib.getExe cfg.package;
		DynamicUser = true;
		RuntimeDirectory = "websurfx";
		Environment = [ "HOME=%t/websurfx" ];
		BindReadOnlyPaths = [ "${settingsFile}:%t/websurfx/.config/websurfx/config.lua" ];
		};

		wants = [ "network-online.target" ];
		after = [ "network-online.target" ];
		wantedBy = [ "multi-user.target" ];
		};
		};

		meta.maintainers = [ lib.maintainers.SchweGELBin ];
		}