From 19a03764b539123074140f7f0613ab0bfc3814df Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 2 May 2021 17:40:21 +0200 Subject: l realwallpaper: serve krebs-stars --- lass/2configs/realwallpaper.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass/2configs') diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index 7a2f6e916..c873ae4d5 100644 --- a/lass/2configs/realwallpaper.nix +++ b/lass/2configs/realwallpaper.nix @@ -28,6 +28,9 @@ in { locations."/realwallpaper-krebs.png".extraConfig = '' root /var/realwallpaper/; ''; + locations."/realwallpaper-krebs-stars.png".extraConfig = '' + root /var/realwallpaper/; + ''; locations."/realwallpaper-video.mp4".extraConfig = '' root /var/realwallpaper/archive; ''; -- cgit v1.2.3 From fd3dff19ed4952a6a92cb3ebf40e52c7ba81d563 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 2 May 2021 17:48:27 +0200 Subject: l fetchWallpaper: use stars version --- lass/2configs/fetchWallpaper.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/fetchWallpaper.nix b/lass/2configs/fetchWallpaper.nix index 065ee9c42..251f886a9 100644 --- a/lass/2configs/fetchWallpaper.nix +++ b/lass/2configs/fetchWallpaper.nix @@ -5,8 +5,7 @@ let in { krebs.fetchWallpaper = { enable = true; - unitConfig.ConditionPathExists = "!/var/run/ppp0.pid"; - url = "prism/realwallpaper-krebs.png"; + url = "prism/realwallpaper-krebs-stars.png"; }; } -- cgit v1.2.3 From 020154a8599142dae4f9ac838fe1657dbf0da8d3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 2 May 2021 19:09:47 +0200 Subject: realwallpaper: add krebs-stars-berlin version --- lass/2configs/realwallpaper.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass/2configs') diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index c873ae4d5..0bae91d89 100644 --- a/lass/2configs/realwallpaper.nix +++ b/lass/2configs/realwallpaper.nix @@ -31,6 +31,9 @@ in { locations."/realwallpaper-krebs-stars.png".extraConfig = '' root /var/realwallpaper/; ''; + locations."/realwallpaper-krebs-stars-berlin.png".extraConfig = '' + root /var/realwallpaper/; + ''; locations."/realwallpaper-video.mp4".extraConfig = '' root /var/realwallpaper/archive; ''; -- cgit v1.2.3 From 950a735472f2b09b08119ba79f10c54a9efb28e6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 3 May 2021 17:59:52 +0200 Subject: l: (re)init echelon.r (with ssh tor unlocking) --- .../tests/dummy-secrets/initrd/ssh.ed25519_key | 0 lass/2configs/tor-initrd.nix | 49 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 lass/2configs/tests/dummy-secrets/initrd/ssh.ed25519_key create mode 100644 lass/2configs/tor-initrd.nix (limited to 'lass/2configs') diff --git a/lass/2configs/tests/dummy-secrets/initrd/ssh.ed25519_key b/lass/2configs/tests/dummy-secrets/initrd/ssh.ed25519_key new file mode 100644 index 000000000..e69de29bb diff --git a/lass/2configs/tor-initrd.nix b/lass/2configs/tor-initrd.nix new file mode 100644 index 000000000..64e64b5b3 --- /dev/null +++ b/lass/2configs/tor-initrd.nix @@ -0,0 +1,49 @@ +{config, pkgs, ... }: +## unlock command: +# (pass admin/$host/root;echo) | torify ssh root@$(pass hosts/$host/initrd/hostname) 'cat > /crypt-ramfs/passphrase' +{ + boot.initrd.network.enable = true; + boot.initrd.network.ssh = { + enable = true; + port = 22; + authorizedKeys = [ + config.krebs.users.lass.pubkey + config.krebs.users.lass-mors.pubkey + config.krebs.users.lass-green.pubkey + ]; + hostKeys = [ ]; + }; + boot.initrd.availableKernelModules = [ "e1000e" ]; + + boot.initrd.secrets = { + "/etc/tor/onion/bootup" = ; + }; + + boot.initrd.extraUtilsCommands = '' + copy_bin_and_libs ${pkgs.tor}/bin/tor + ''; + + # start tor during boot process + boot.initrd.network.postCommands = let + torRc = (pkgs.writeText "tor.rc" '' + DataDirectory /etc/tor + SOCKSPort 127.0.0.1:9050 IsolateDestAddr + SOCKSPort 127.0.0.1:9063 + HiddenServiceDir /etc/tor/onion/bootup + HiddenServicePort 22 127.0.0.1:22 + ''); + in '' + echo "tor: preparing onion folder" + # have to do this otherwise tor does not want to start + chmod -R 700 /etc/tor + + echo "make sure localhost is up" + ip a a 127.0.0.1/8 dev lo + ip link set lo up + + echo "tor: starting tor" + tor -f ${torRc} --verify-config + tor -f ${torRc} & + ''; +} + -- cgit v1.2.3 From b1437a3b1761a58cfa8d601c20da0a0f13e3d795 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 25 May 2021 09:49:39 +0200 Subject: l radio: move to hackint --- lass/2configs/radio.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix index 707cc8459..cfc280e50 100644 --- a/lass/2configs/radio.nix +++ b/lass/2configs/radio.nix @@ -223,7 +223,7 @@ in { systemd.services."reaktor2-the_playlist".serviceConfig.DynamicUser = mkForce false; krebs.reaktor2.the_playlist = { - hostname = "irc.freenode.org"; + hostname = "irc.hackint.org"; port = "6697"; useTLS = true; nick = "the_playlist"; -- cgit v1.2.3