summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/default.nix2
-rw-r--r--krebs/3modules/hidden-ssh.nix2
-rw-r--r--krebs/3modules/realwallpaper.nix8
-rw-r--r--krebs/3modules/tv/default.nix22
-rw-r--r--krebs/5pkgs/htgen/default.nix12
-rw-r--r--krebs/5pkgs/irc-announce/default.nix2
-rw-r--r--krebs/5pkgs/realwallpaper/default.nix8
7 files changed, 26 insertions, 30 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 0364792b5..37db5bfe7 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -68,7 +68,7 @@ let
# TODO search-domains :: listOf hostname
search-domain = mkOption {
type = types.hostname;
- default = "retiolum";
+ default = "r";
};
zone-head-config = mkOption {
type = with types; attrsOf str;
diff --git a/krebs/3modules/hidden-ssh.nix b/krebs/3modules/hidden-ssh.nix
index 2f75ded9b..3930dbf42 100644
--- a/krebs/3modules/hidden-ssh.nix
+++ b/krebs/3modules/hidden-ssh.nix
@@ -27,7 +27,7 @@ let
};
systemd.services.hidden-ssh-announce = {
description = "irc announce hidden ssh";
- after = [ "tor.service" ];
+ after = [ "tor.service" "network-online.target" ];
wants = [ "tor.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
diff --git a/krebs/3modules/realwallpaper.nix b/krebs/3modules/realwallpaper.nix
index f9eae8c92..1e7a9faae 100644
--- a/krebs/3modules/realwallpaper.nix
+++ b/krebs/3modules/realwallpaper.nix
@@ -32,9 +32,9 @@ let
default = "http://xplanetclouds.com/free/local/clouds_2048.jpg";
};
- outFile = mkOption {
+ marker = mkOption {
type = types.str;
- default = "/tmp/wallpaper.png";
+ default = "http://graphs.r/marker.json";
};
timerConfig = mkOption {
@@ -43,7 +43,6 @@ let
OnCalendar = "*:0/15";
};
};
-
};
imp = {
@@ -63,6 +62,7 @@ let
imagemagick
curl
file
+ jq
];
environment = {
@@ -70,7 +70,7 @@ let
nightmap_url = cfg.nightmap;
daymap_url = cfg.daymap;
cloudmap_url = cfg.cloudmap;
- out_file = cfg.outFile;
+ marker_url = cfg.marker;
};
restartIfChanged = true;
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 48b110fac..2da38e08d 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -12,7 +12,7 @@ with import <stockholm/lib>;
nets = {
retiolum = {
ip4.addr = "10.243.21.1";
- ip6.addr = "42:0:0:0:0:0:0:2101";
+ ip6.addr = "42::2101";
aliases = [
"alnus.r"
];
@@ -53,7 +53,7 @@ with import <stockholm/lib>;
retiolum = {
via = config.krebs.hosts.caxi.nets.internet;
ip4.addr = "10.243.113.226";
- ip6.addr = "42:4522:25f8:36bb:8ccb:0150:231a:2af6";
+ ip6.addr = "42:4522:25f8:36bb:8ccb:150:231a:2af6";
aliases = [
"caxi.r"
];
@@ -94,7 +94,7 @@ with import <stockholm/lib>;
retiolum = {
via = config.krebs.hosts.cd.nets.internet;
ip4.addr = "10.243.113.222";
- ip6.addr = "42:4522:25f8:36bb:8ccb:0150:231a:2af3";
+ ip6.addr = "42:4522:25f8:36bb:8ccb:150:231a:2af3";
aliases = [
"cd.r"
"cgit.cd.r"
@@ -129,7 +129,7 @@ with import <stockholm/lib>;
};
retiolum = {
ip4.addr = "10.243.13.39";
- ip6.addr = "42:0:0:0:0:0:0:1339";
+ ip6.addr = "42::1339";
aliases = [
"ju.r"
];
@@ -164,7 +164,7 @@ with import <stockholm/lib>;
};
retiolum = {
ip4.addr = "10.243.166.2";
- ip6.addr = "42:0b9d:6660:d07c:2bb7:4e91:1a01:2e7d";
+ ip6.addr = "42:b9d:6660:d07c:2bb7:4e91:1a01:2e7d";
aliases = [
"kaepsele.r"
];
@@ -187,7 +187,7 @@ with import <stockholm/lib>;
nets = {
retiolum = {
ip4.addr = "10.243.20.1";
- ip6.addr = "42:0:0:0:0:0:0:2001";
+ ip6.addr = "42::2001";
aliases = [
"mu.r"
];
@@ -226,7 +226,7 @@ with import <stockholm/lib>;
retiolum = {
via = config.krebs.hosts.ni.nets.internet;
ip4.addr = "10.243.113.223";
- ip6.addr = "42:4522:25f8:36bb:8ccb:0150:231a:2af4";
+ ip6.addr = "42:4522:25f8:36bb:8ccb:150:231a:2af4";
aliases = [
"ni.r"
"cgit.ni.r"
@@ -260,7 +260,7 @@ with import <stockholm/lib>;
};
retiolum = {
ip4.addr = "10.243.0.110";
- ip6.addr = "42:02d5:733f:d6da:c0f5:2bb7:2b18:09ec";
+ ip6.addr = "42:2d5:733f:d6da:c0f5:2bb7:2b18:9ec";
aliases = [
"nomic.r"
"cgit.nomic.r"
@@ -318,7 +318,7 @@ with import <stockholm/lib>;
};
retiolum = {
ip4.addr = "10.243.13.37";
- ip6.addr = "42:0:0:0:0:0:0:1337";
+ ip6.addr = "42::1337";
aliases = [
"wu.r"
"cgit.wu.r"
@@ -355,7 +355,7 @@ with import <stockholm/lib>;
};
retiolum = {
ip4.addr = "10.243.13.38";
- ip6.addr = "42:0:0:0:0:0:0:1338";
+ ip6.addr = "42::1338";
aliases = [
"xu.r"
];
@@ -387,7 +387,7 @@ with import <stockholm/lib>;
};
retiolum = {
ip4.addr = "10.243.13.40";
- ip6.addr = "42:0:0:0:0:0:0:1340";
+ ip6.addr = "42::1340";
aliases = [
"zu.r"
];
diff --git a/krebs/5pkgs/htgen/default.nix b/krebs/5pkgs/htgen/default.nix
index f9dfeb3d1..0fca8bdf2 100644
--- a/krebs/5pkgs/htgen/default.nix
+++ b/krebs/5pkgs/htgen/default.nix
@@ -1,26 +1,26 @@
-{ bash, coreutils, gnused, stdenv, fetchgit, ucspi-tcp }:
+{ coreutils, dash, fetchgit, gnused, stdenv, ucspi-tcp }:
with import <stockholm/lib>;
let
- version = "1.1";
+ version = "1.2.2";
in stdenv.mkDerivation {
name = "htgen-${version}";
src = fetchgit {
url = "http://cgit.krebsco.de/htgen";
rev = "refs/tags/v${version}";
- sha256 = "1zxj0fv9vdrqyl3x2hgq7a6xdlzpclf93akygysrzsqk9wjapp4z";
+ sha256 = "0a8vn35vq6pxgk6d3d2cjp0vdxzq9nqf0zgkvnd6668v4cmdf91b";
};
installPhase = ''
mkdir -p $out/bin
{
- echo '#! ${bash}/bin/bash'
+ echo '#! ${dash}/bin/dash'
echo 'export PATH=${makeBinPath [
- ucspi-tcp
coreutils
gnused
+ ucspi-tcp
]}''${PATH+":$PATH"}'
- cat htgen
+ sed 's:^Server=htgen$:&/${version}:' htgen
} > $out/bin/htgen
chmod +x $out/bin/htgen
cp -r examples $out
diff --git a/krebs/5pkgs/irc-announce/default.nix b/krebs/5pkgs/irc-announce/default.nix
index e1f4919d5..6eb725b71 100644
--- a/krebs/5pkgs/irc-announce/default.nix
+++ b/krebs/5pkgs/irc-announce/default.nix
@@ -24,7 +24,7 @@ pkgs.writeDashBin "irc-announce" ''
# echo2 and cat2 are used output to both, stdout and stderr
# This is used to see what we send to the irc server. (debug output)
echo2() { echo "$*"; echo "$*" >&2; }
- cat2() { tee /dev/stderr; }
+ cat2() { awk '{print;print > "/dev/stderr"}'; }
# privmsg_cat transforms stdin to a privmsg
privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; }
diff --git a/krebs/5pkgs/realwallpaper/default.nix b/krebs/5pkgs/realwallpaper/default.nix
index 4fea977ec..dec2dada4 100644
--- a/krebs/5pkgs/realwallpaper/default.nix
+++ b/krebs/5pkgs/realwallpaper/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
src = fetchgit {
url = https://github.com/Lassulus/realwallpaper;
- rev = "c2778c3c235fc32edc8115d533a0d0853ab101c5";
- sha256 = "0yhbjz19zk8sj5dsvccm6skkqq2vardn1yi70qmd5li7qvp17mvs";
+ rev = "b8408cfb295b6ce5b965309b30358ca6c6409efd";
+ sha256 = "0yyl8hhqshw9bx04xs8glvir3c0qzvfrwzmbvyg318mnz5xalcl0";
};
phases = [
@@ -15,10 +15,6 @@ stdenv.mkDerivation {
];
buildInputs = [
- xplanet
- imagemagick
- curl
- file
];
installPhase = ''
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 03:24:07 +0000