Revert "various: replace `systemd.services.<name>.{script,preStart}` with... (4400ebee) · Commits · nix / nixpkgs

nixos/modules/security/soteria.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,8 +36,8 @@ in
		wants = [ "graphical-session.target" ];
		after = [ "graphical-session.target" ];

		script = lib.getExe cfg.package;
		serviceConfig = {
		ExecStart = lib.getExe cfg.package;
		Type = "simple";
		Restart = "on-failure";
		RestartSec = 1;

nixos/modules/services/blockchain/ethereum/geth.nix

+31 −37

Original line number	Diff line number	Diff line
		@@ -206,43 +206,6 @@ in
		after = [ "network.target" ];

		serviceConfig = {
		ExecStart =
		let
		args = lib.cli.toCommandLineShellGNU { } {
		inherit (cfg)
		syncmode
		gcmode
		port
		maxpeers
		;
		nousb = true;
		ipcdisable = true;
		datadir = dataDir;
		${cfg.network} = true;

		http = cfg.http.enable;
		"http.addr" = if cfg.http.enable then cfg.http.address else null;
		"http.port" = if cfg.http.enable then cfg.http.port else null;
		"http.api" = if cfg.http.apis != null then lib.concatStringsSep "," cfg.http.apis else null;

		ws = cfg.websocket.enable;
		"ws.addr" = if cfg.websocket.enable then cfg.websocket.address else null;
		"ws.port" = if cfg.websocket.enable then cfg.websocket.port else null;
		"ws.api" = if cfg.websocket.apis != null then lib.concatStringsSep "," cfg.websocket.apis else null;

		metrics = cfg.metrics.enable;
		"metrics.addr" = if cfg.metrics.enable then cfg.metrics.address else null;
		"metrics.port" = if cfg.metrics.enable then cfg.metrics.port else null;

		"authrpc.addr" = cfg.authrpc.address;
		"authrpc.port" = cfg.authrpc.port;
		"authrpc.vhosts" = lib.concatStringsSep "," cfg.authrpc.vhosts;
		"authrpc.jwtsecret" =
		if cfg.authrpc.jwtsecret != "" then cfg.authrpc.jwtsecret else "${dataDir}/geth/jwtsecret";
		};
		in
		"${lib.getExe cfg.package} ${args} ${lib.escapeShellArgs cfg.extraArgs}";

		DynamicUser = true;
		Restart = "always";
		StateDirectory = stateDir;
		@@ -254,6 +217,37 @@ in
		PrivateDevices = "true";
		MemoryDenyWriteExecute = "true";
		};

		script = ''
		${cfg.package}/bin/geth \
		--nousb \
		--ipcdisable \
		${lib.optionalString (cfg.network != null) ''--${cfg.network}''} \
		--syncmode ${cfg.syncmode} \
		--gcmode ${cfg.gcmode} \
		--port ${toString cfg.port} \
		--maxpeers ${toString cfg.maxpeers} \
		${lib.optionalString cfg.http.enable ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}''} \
		${
		lib.optionalString (cfg.http.apis != null) ''--http.api ${lib.concatStringsSep "," cfg.http.apis}''
		} \
		${lib.optionalString cfg.websocket.enable ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}''} \
		${
		lib.optionalString (
		cfg.websocket.apis != null
		) ''--ws.api ${lib.concatStringsSep "," cfg.websocket.apis}''
		} \
		${lib.optionalString cfg.metrics.enable ''--metrics --metrics.addr ${cfg.metrics.address} --metrics.port ${toString cfg.metrics.port}''} \
		--authrpc.addr ${cfg.authrpc.address} --authrpc.port ${toString cfg.authrpc.port} --authrpc.vhosts ${lib.concatStringsSep "," cfg.authrpc.vhosts} \
		${
		if (cfg.authrpc.jwtsecret != "") then
		''--authrpc.jwtsecret ${cfg.authrpc.jwtsecret}''
		else
		''--authrpc.jwtsecret ${dataDir}/geth/jwtsecret''
		} \
		${lib.escapeShellArgs cfg.extraArgs} \
		--datadir ${dataDir}
		'';
		}
		))
		) eachGeth;

nixos/modules/services/computing/boinc/client.nix

+3 −1

Original line number	Diff line number	Diff line
		@@ -99,8 +99,10 @@ in
		description = "BOINC Client";
		after = [ "network.target" ];
		wantedBy = [ "multi-user.target" ];
		script = ''
		exec ${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}
		'';
		serviceConfig = {
		ExecStart = "${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}";
		User = "boinc";
		Nice = 10;
		};

nixos/modules/services/computing/slurm/slurm.nix

+4 −2

Original line number	Diff line number	Diff line
		@@ -475,13 +475,15 @@ in
		''}
		'';

		environment.SLURM_CONF = configPath;
		script = ''
		export SLURM_CONF=${configPath}
		exec ${cfg.package}/bin/slurmdbd -D
		'';

		serviceConfig = {
		RuntimeDirectory = "slurmdbd";
		Type = "simple";
		PIDFile = "/run/slurmdbd.pid";
		ExecStart = "${lib.getExe' cfg.package "slurmdbd"} -D";
		ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
		};
		};

nixos/modules/services/games/minetest-server.nix

+6 −3

Original line number	Diff line number	Diff line
		@@ -172,9 +172,12 @@ in
		serviceConfig.Restart = "always";
		serviceConfig.User = "minetest";
		serviceConfig.Group = "minetest";
		serviceConfig.StateDirectory = "minetest";
		serviceConfig.WorkingDirectory = "/var/lib/minetest";
		serviceConfig.ExecStart = "${pkgs.minetest}/bin/minetest ${lib.escapeShellArgs flags}";

		script = ''
		cd /var/lib/minetest

		exec ${pkgs.minetest}/bin/minetest ${lib.escapeShellArgs flags}
		'';
		};
		};
		}