clan/clan-core
12
4
Fork 18
Code Issues 99 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

rename hidden-announce to hidden-ssh-announce, create qr codes
All checks were successful
build / test (push) Successful in 11s
Details

Browse Source
This commit is contained in:
lassulus 2023-07-24 12:09:11 +02:00
parent 930f1660e9
commit e9c0432681
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@ -31,12 +31,12 @@
installer = { installer = {
imports = [ imports = [
./installer.nix ./installer.nix
./hidden-announce.nix ./hidden-ssh-announce.nix
]; ];
}; };
hidden-announce = { hidden-announce = {
imports = [ imports = [
./hidden-announce.nix ./hidden-ssh-announce.nix
]; ];
}; };
}; };

11
hidden-announce.nix → hidden-ssh-announce.nix
View File

@ -3,11 +3,11 @@
, pkgs , pkgs
, ... , ...
}: { }: {
options.hidden-announce = { options.hidden-ssh-announce = {
enable = lib.mkEnableOption "hidden-announce"; enable = lib.mkEnableOption "hidden-ssh-announce";
script = lib.mkOption { script = lib.mkOption {
type = lib.types.package; type = lib.types.package;
default = pkgs.writers.writeDash "test-output"; default = pkgs.writers.writeDash "test-output" "echo $1";
description = '' description = ''
script to run when the hidden tor service was started and they hostname is known. script to run when the hidden tor service was started and they hostname is known.
takes the hostname as $1 takes the hostname as $1
@ -15,7 +15,8 @@
}; };
}; };
config = lib.mkIf config.hidden-announce.enable { config = lib.mkIf config.hidden-ssh-announce.enable {
services.openssh.enable = true;
services.tor = { services.tor = {
enable = true; enable = true;
relay.onionServices.hidden-ssh = { relay.onionServices.hidden-ssh = {
@ -43,7 +44,7 @@
sleep 1 sleep 1
done done
${config.hidden-announce.script} "$(cat ${config.services.tor.settings.DataDirectory}/onion/hidden-ssh/hostname)" ${config.hidden-ssh-announce.script} "$(cat ${config.services.tor.settings.DataDirectory}/onion/hidden-ssh/hostname)"
''; '';
PrivateTmp = "true"; PrivateTmp = "true";
User = "tor"; User = "tor";

15
installer.nix
View File

@ -11,18 +11,27 @@
${pkgs.pwgen}/bin/pwgen -s 16 1 > /var/shared/root-password ${pkgs.pwgen}/bin/pwgen -s 16 1 > /var/shared/root-password
echo "root:$(cat /var/shared/root-password)" | chpasswd echo "root:$(cat /var/shared/root-password)" | chpasswd
''; '';
hidden-announce = { hidden-ssh-announce = {
enable = true; enable = true;
script = pkgs.writers.writeDash "write-hostname" '' script = pkgs.writers.writeDash "write-hostname" ''
mkdir -p /var/shared mkdir -p /var/shared
echo "$1" > /var/shared/onion-hostname echo "$1" > /var/shared/onion-hostname
${pkgs.jq}/bin/jq -nc \
--arg password "$(cat /var/shared/root-password)" \
--arg address "$(cat /var/shared/onion-hostname)" '{
password: $password, address: $address
}' > /var/shared/login.info
cat /var/shared/login.info |
${pkgs.qrencode}/bin/qrencode -t utf8 > /var/shared/qrcode.utf8
cat /var/shared/login.info |
${pkgs.qrencode}/bin/qrencode -t png > /var/shared/qrcode.png
''; '';
}; };
services.getty.autologinUser = lib.mkForce "root"; services.getty.autologinUser = lib.mkForce "root";
programs.bash.interactiveShellInit = '' programs.bash.interactiveShellInit = ''
if [ "$(tty)" = "/dev/tty1" ]; then if [ "$(tty)" = "/dev/tty1" ]; then
until test -e /var/shared/onion-hostname; do sleep 1; done until test -e /var/shared/qrcode.utf8; do sleep 1; done
echo "ssh://root:$(cat /var/shared/root-password)@$(cat /var/shared/onion-hostname)" cat /var/shared/qrcode.utf8
fi fi
''; '';
formatConfigs.install-iso = { formatConfigs.install-iso = {