JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rset: init at 2.1

Browse Source
This commit is contained in:
Charles Strahan 2021-04-25 05:42:09 -05:00
parent 2fe3c76bcf
commit e17b57ad75
3 changed files with 181 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pkgs/tools/admin/rset/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ lib, stdenv, fetchurl, coreutils, openssh, gnutar }:
stdenv.mkDerivation rec {
pname = "rset";
version = "2.1";
src = fetchurl {
url = "https://scriptedconfiguration.org/code/${pname}-${version}.tar.gz";
sha256 = "0916f96afl8kcn2hpj4qhg92g2j93ycp2sb94nsz3q44sqc6ddhb";
};
patches = [ ./paths.patch ];
postPatch = ''
substituteInPlace rset.c \
--replace @ssh@ ${openssh}/bin/ssh \
--replace @miniquark@ $out/bin/miniquark \
--replace @rinstall@ $out/bin/rinstall \
--replace @rsub@ $out/bin/rsub
substituteInPlace execute.c \
--replace @ssh@ ${openssh}/bin/ssh \
--replace @ssh-add@ ${openssh}/bin/ssh-add \
--replace @tar@ ${gnutar}/bin/tar
substituteInPlace rutils.c \
--replace @install@ ${coreutils}/bin/install
'';
# these are to be run on the remote host,
# so we want to preserve the original shebang.
postFixup = ''
sed -i "1s@.*@#!/bin/sh@" $out/bin/rinstall
sed -i "1s@.*@#!/bin/sh@" $out/bin/rsub
'';
dontAddPrefix = true;
installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
homepage = "https://scriptedconfiguration.org/";
description = "Configure systems using any scripting language";
changelog = "https://github.com/eradman/rset/raw/${version}/NEWS";
license = licenses.isc;
platforms = platforms.unix;
maintainers = with maintainers; [ cstrahan ];
};
}

131
pkgs/tools/admin/rset/paths.patch Normal file
View File

@ -0,0 +1,131 @@
diff --git a/execute.c b/execute.c
index be06068..3468fa7 100644
--- a/execute.c
+++ b/execute.c
@@ -242,7 +242,7 @@ verify_ssh_agent() {
char *output;
char *argv[32];
- append(argv, 0, "ssh-add", "-l", NULL);
+ append(argv, 0, "@ssh-add@", "-l", NULL);
output = cmd_pipe_stdout(argv, &error_code, &output_size);
free(output);
@@ -282,7 +282,7 @@ start_connection(char *socket_path, Label *route_label, int http_port, const cha
}
argc = 0;
- argc = append(argv, argc, "ssh", "-fN", "-R", port_forwarding, "-S",
+ argc = append(argv, argc, "@ssh@", "-fN", "-R", port_forwarding, "-S",
socket_path, "-M", NULL);
if (ssh_config)
(void) append(argv, argc, "-F", ssh_config, host_name, NULL);
@@ -292,12 +292,12 @@ start_connection(char *socket_path, Label *route_label, int http_port, const cha
return -1;
snprintf(tmp_path, sizeof(tmp_path), "mkdir " REMOTE_TMP_PATH, http_port);
- append(argv, 0, "ssh", "-S", socket_path, host_name, tmp_path, NULL);
+ append(argv, 0, "@ssh@", "-S", socket_path, host_name, tmp_path, NULL);
if (run(argv) != 0)
return -1;
- snprintf(cmd, PATH_MAX, "tar -cf - %s -C " REPLICATED_DIRECTORY " ./ | "
- "exec ssh -q -S %s %s tar -xf - -C " REMOTE_TMP_PATH,
+ snprintf(cmd, PATH_MAX, "@tar@ -cf - %s -C " REPLICATED_DIRECTORY " ./ | "
+ "exec @ssh@ -q -S %s %s tar -xf - -C " REMOTE_TMP_PATH,
array_to_str(route_label->export_paths), socket_path, host_name,
http_port);
if (system(cmd) != 0) {
@@ -326,7 +326,7 @@ ssh_command_pipe(char *host_name, char *socket_path, Label *host_label, int http
/* construct ssh command */
argc = 0;
- argc = append(argv, argc, "ssh", "-T", "-S", socket_path, NULL);
+ argc = append(argv, argc, "@ssh@", "-T", "-S", socket_path, NULL);
(void) append(argv, argc, host_name, cmd, NULL);
return cmd_pipe_stdin(argv, host_label->content, host_label->content_size);
@@ -344,7 +344,7 @@ ssh_command_tty(char *host_name, char *socket_path, Label *host_label, int http_
http_port);
/* construct ssh command */
argc = 0;
- argc = append(argv, argc, "ssh", "-T", "-S", socket_path, NULL);
+ argc = append(argv, argc, "@ssh@", "-T", "-S", socket_path, NULL);
(void) append(argv, argc, host_name, cmd, NULL);
cmd_pipe_stdin(argv, host_label->content, host_label->content_size);
@@ -360,7 +360,7 @@ ssh_command_tty(char *host_name, char *socket_path, Label *host_label, int http_
/* construct ssh command */
argc = 0;
- argc = append(argv, argc, "ssh", "-t", "-S", socket_path, NULL);
+ argc = append(argv, argc, "@ssh@", "-t", "-S", socket_path, NULL);
(void) append(argv, argc, host_name, cmd, NULL);
return run(argv);
@@ -375,11 +375,11 @@ end_connection(char *socket_path, char *host_name, int http_port) {
return;
snprintf(tmp_path, sizeof(tmp_path), REMOTE_TMP_PATH, http_port);
- append(argv, 0, "ssh", "-S", socket_path, host_name, "rm", "-rf", tmp_path , NULL);
+ append(argv, 0, "@ssh@", "-S", socket_path, host_name, "rm", "-rf", tmp_path , NULL);
if (run(argv) != 0)
warn("remote tmp dir");
- append(argv, 0, "ssh", "-q", "-S", socket_path, "-O", "exit", host_name, NULL);
+ append(argv, 0, "@ssh@", "-q", "-S", socket_path, "-O", "exit", host_name, NULL);
if (run(argv) != 0)
warn("exec ssh -O exit");
}
diff --git a/rset.c b/rset.c
index 383fc82..9c20f65 100644
--- a/rset.c
+++ b/rset.c
@@ -128,10 +128,8 @@ int main(int argc, char *argv[])
hostnames[i] = argv[optind+i];
hostnames[i] = NULL;
- if ((rinstall_bin = findprog("rinstall")) == 0)
- not_found("rinstall");
- if ((rsub_bin = findprog("rsub")) == 0)
- not_found("rsub");
+ rinstall_bin = "@rinstall@";
+ rsub_bin = "@rsub@";
/* all operations must be relative to the routes file */
if (realpath(xdirname(routes_file), routes_realpath) == NULL)
@@ -159,10 +157,9 @@ int main(int argc, char *argv[])
/* Convert http server command line into a vector */
inputstring = malloc(PATH_MAX);
- snprintf(inputstring, PATH_MAX, "miniquark -p %d -d " PUBLIC_DIRECTORY, http_port);
+ snprintf(inputstring, PATH_MAX, "@miniquark@ -p %d -d " PUBLIC_DIRECTORY, http_port);
str_to_array(http_srv_argv, inputstring, sizeof(http_srv_argv));
- if ((httpd_bin = findprog(http_srv_argv[0])) == 0)
- not_found(http_srv_argv[0]);
+ httpd_bin = "@miniquark@";
/* start the web server */
pipe(stdout_pipe);
@@ -397,7 +394,7 @@ handle_exit(int sig) {
printf("caught signal %d, terminating connection to '%s'\n", sig,
hostname);
/* clean up socket and SSH connection; leaving staging dir */
- execlp("ssh", "ssh", "-S", socket_path, "-O", "exit", hostname, NULL);
+ execlp("@ssh@", "@ssh@", "-S", socket_path, "-O", "exit", hostname, NULL);
err(1, "ssh -O exit");
}
}
diff --git a/rutils.c b/rutils.c
index 1e182d8..9aef76d 100644
--- a/rutils.c
+++ b/rutils.c
@@ -77,7 +77,7 @@ install_if_new(const char *src, const char *dst) {
pid = fork();
if (pid == 0) {
- if (execl("/usr/bin/install", "/usr/bin/install", src, dst, NULL) != -1)
+ if (execl("@install@", "@install@", src, dst, NULL) != -1)
err(1, "%s", dst);
}
waitpid(pid, &status, 0);

2
pkgs/top-level/all-packages.nix
View File

@ -8019,6 +8019,8 @@ in
rrdtool = callPackage ../tools/misc/rrdtool { };
rset = callPackage ../tools/admin/rset { };
rshijack = callPackage ../tools/networking/rshijack { };
rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { };