Luis/nextjs-python-web-template
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'install-iso: use disko.makeDiskImage' (#57) from lassulus-disko-installer into main

Browse Source
This commit is contained in:
clan-bot
2023-07-28 16:21:39 +00:00
parent d1298e319a a065849196
commit 6266030797
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/hidden-ssh-announce.nix
View File

@@ -31,7 +31,7 @@
client.enable = true; client.enable = true;
}; };
systemd.services.hidden-ssh-announce = { systemd.services.hidden-ssh-announce = {
description = "irc announce hidden ssh"; description = "announce hidden ssh";
after = [ "tor.service" "network-online.target" ]; after = [ "tor.service" "network-online.target" ];
wants = [ "tor.service" ]; wants = [ "tor.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];

8
modules/installer.nix
View File

@@ -20,6 +20,7 @@
hidden-ssh-announce = { hidden-ssh-announce = {
enable = true; enable = true;
script = pkgs.writers.writeDash "write-hostname" '' script = pkgs.writers.writeDash "write-hostname" ''
set -efu
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 \ ${pkgs.jq}/bin/jq -nc \
@@ -28,15 +29,16 @@
password: $password, address: $address password: $password, address: $address
}' > /var/shared/login.info }' > /var/shared/login.info
cat /var/shared/login.info | cat /var/shared/login.info |
${pkgs.qrencode}/bin/qrencode -t utf8 > /var/shared/qrcode.utf8 ${pkgs.qrencode}/bin/qrencode -t utf8 -o /var/shared/qrcode.utf8
cat /var/shared/login.info | cat /var/shared/login.info |
${pkgs.qrencode}/bin/qrencode -t png > /var/shared/qrcode.png ${pkgs.qrencode}/bin/qrencode -t png -o /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/qrcode.utf8; do sleep 1; done echo 'waiting for tor to generate the hidden service'
until test -e /var/shared/qrcode.utf8; do echo .; sleep 1; done
cat /var/shared/qrcode.utf8 cat /var/shared/qrcode.utf8
fi fi
''; '';