This repository has no description
change tor vars generator to hostname
author
lassulus
date
(Jul 8, 2025, 4:36 PM CEST)
commit
9c5caa97
9c5caa979480c8706a5ec0a12910a293b4dc34e8
parent
1580d28d
1580d28d3f96092827b85394bdb68a67b9e04b3f
+11
-10
+9
-8
2configs/tor-ssh.nix
+9
-8
2configs/tor-ssh.nix
···
10
10
target.port = 22;
11
11
}
12
12
];
13
-
secretKey = config.clan.core.vars.generators.tor-ssh.files."ssh-tor.priv".path;
13
+
secretKey = config.clan.core.vars.generators.tor-ssh.files."hs_ed25519_secret_key".path;
14
14
};
15
15
controlSocket.enable = true;
16
16
client.enable = true;
17
17
};
18
18
19
19
clan.core.vars.generators.tor-ssh = {
20
-
files."ssh-tor.priv" = { };
21
-
files."tor-hostname".deploy = false;
22
-
migrateFact = "tor-ssh";
20
+
files."hs_ed25519_secret_key" = { };
21
+
files."hostname".deploy = false;
23
22
runtimeInputs = with pkgs; [
24
23
coreutils
25
-
mkp224o
24
+
tor
26
25
];
27
26
script = ''
28
-
mkp224o-donna lass -n 1 -d . -q -O addr
29
-
mv "$(cat addr)"/hs_ed25519_secret_key "$out"/ssh-tor.priv
30
-
mv addr "$out"/tor-hostname
27
+
mkdir -p data
28
+
echo -e "DataDirectory ./data\nSocksPort 0\nHiddenServiceDir ./hs\nHiddenServicePort 80 127.0.0.1:80" > torrc
29
+
timeout 2 tor -f torrc || :
30
+
mv hs/hs_ed25519_secret_key $out/hs_ed25519_secret_key
31
+
mv hs/hostname $out/hostname
31
32
'';
32
33
};
33
34
}
+2
-2
tools/muchsync/flake-module.nix
+2
-2
tools/muchsync/flake-module.nix
···
75
75
clan_path=$(nix build --no-link --print-out-paths "${self}#clan-cli")
76
76
77
77
# Get tor hostname using clan CLI
78
-
tor_hostname=$(CLAN_DIR="${self}" "$clan_path/bin/clan" vars get green tor-ssh/tor-hostname)
78
+
tor_hostname=$(CLAN_DIR="${self}" "$clan_path/bin/clan" vars get green tor-ssh/hostname)
79
79
80
80
# Use muchsync with custom ssh command via tornade
81
-
exec ${exePath} "$@" -s "$tornade_path/bin/tornade ssh" lass@"$tor_hostname"
81
+
exec ${exePath} -s "$tornade_path/bin/tornade ssh" "$@" lass@"$tor_hostname"
82
82
else
83
83
exec ${exePath} "$@" lass@"$host"
84
84
fi