summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2023-05-16 19:32:49 +0200
committertv <tv@krebsco.de>2023-05-16 19:32:49 +0200
commit56cff01ac49351e4a80a6003e96393922026f0ad (patch)
tree94c85c4e59028a3b41ff83c2fad05782bae551e0
parente3c8492f30a2c73acfb43478d8ceb8c38d7fa777 (diff)
parentdf09f8293f326235d417ec750edf05298ba468de (diff)
Merge remote-tracking branch 'orange/master'
-rw-r--r--kartei/mic92/default.nix7
-rw-r--r--krebs/2configs/reaktor2.nix50
-rw-r--r--krebs/5pkgs/simple/htgen-paste/default.nix27
-rw-r--r--krebs/5pkgs/simple/htgen-paste/src/htgen-paste68
-rw-r--r--krebs/5pkgs/simple/kpaste/default.nix3
-rw-r--r--krebs/nixpkgs-unstable.json8
-rw-r--r--krebs/nixpkgs.json8
-rw-r--r--lass/1systems/aergia/config.nix4
-rw-r--r--lass/2configs/paste.nix11
9 files changed, 164 insertions, 22 deletions
diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix
index 952b5fd40..003c66c66 100644
--- a/kartei/mic92/default.nix
+++ b/kartei/mic92/default.nix
@@ -809,7 +809,14 @@ in {
blob64 = {
owner = config.krebs.users.mic92;
nets = rec {
+ internet = {
+ # of2.dse.cit.tum.de.
+ ip4.addr = "131.159.38.25";
+ ip6.addr = "2a09:80c0:38::25";
+ aliases = [ "blob64.i" ];
+ };
retiolum = {
+ via = internet;
aliases = [ "blob64.r" ];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 0a5031415..67c2dd4cd 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -81,7 +81,8 @@ let
echo "$_from: $(report_error "$response")"
exit 0
fi
- printf '%s' "$text" | echo "$_from: $(cat)"
+ # value seems to be 512 - overhead
+ echo "$_from: $text" | fold -s -w 426
printf '%s' "$response" |
jq -r '[.item.messages[1].sourceAttributions[].seeMoreUrl] | to_entries[] | "[\(.key + 1)]: \(.value)"'
@@ -90,6 +91,52 @@ let
};
};
+ bing-img = {
+ pattern = "!bing-img (.*)$";
+ activate = "match";
+ arguments = [1];
+ timeoutSec = 1337;
+ command = {
+ filename = pkgs.writeDash "bing-img" ''
+ set -efu
+ report_error() {
+ printf '%s' "$*" |
+ curl -Ss http://p.r --data-binary @- |
+ tail -1 |
+ echo "error $(cat)"
+ exit 0
+ }
+ export PATH=${makeBinPath [
+ pkgs.dash
+ pkgs.coreutils
+ pkgs.curl
+ pkgs.findutils
+ pkgs.jq
+ ]}
+ response=$(printf '%s' "$*" |
+ curl -SsG http://bing-gpt.r/api/images --data-urlencode 'prompt@-'
+ )
+ if [ "$?" -ne 0 ]; then
+ report_error "$response"
+ else
+ if ! text=$(
+ printf '%s' "$response" |
+ jq -er '.[].url'
+ ); then
+ echo "$_from: $(report_error "$response")"
+ exit 0
+ fi
+ echo "$text" |
+ xargs -I {} dash -c 'curl -Ss {} |
+ curl -Ss https://p.krebsco.de --data-binary @- |
+ tail -1' |
+ tr '\n' ' ' |
+ echo "$_from: $(cat)"
+ fi
+ '';
+ };
+ };
+
confuse = {
pattern = "!confuse (.*)$";
activate = "match";
@@ -362,6 +409,7 @@ let
bedger-add
bedger-balance
bing
+ bing-img
hooks.sed
interrogate
say
diff --git a/krebs/5pkgs/simple/htgen-paste/default.nix b/krebs/5pkgs/simple/htgen-paste/default.nix
new file mode 100644
index 000000000..48b72833e
--- /dev/null
+++ b/krebs/5pkgs/simple/htgen-paste/default.nix
@@ -0,0 +1,27 @@
+{ pkgs, stockholm, stdenv }:
+with stockholm.lib;
+
+stdenv.mkDerivation rec {
+ pname = "htgen-paste";
+ version = "1.0.0";
+
+ src = ./src;
+
+ buildPhase = ''
+ (
+ exec > htgen-paste
+ echo PATH=${makeBinPath [
+ pkgs.nix
+ pkgs.file
+ pkgs.coreutils
+ pkgs.findutils
+ ]}
+ echo STATEDIR=${shell.escape "\${STATEDIR-$HOME}"}
+ cat $src/htgen-paste
+ )
+ '';
+
+ installPhase = ''
+ install -D htgen-paste $out/bin/htgen-paste
+ '';
+}
diff --git a/krebs/5pkgs/simple/htgen-paste/src/htgen-paste b/krebs/5pkgs/simple/htgen-paste/src/htgen-paste
new file mode 100644
index 000000000..bc806e870
--- /dev/null
+++ b/krebs/5pkgs/simple/htgen-paste/src/htgen-paste
@@ -0,0 +1,68 @@
+find_item() {
+ if test ${#1} -ge 7; then
+ set -- "$(find "$STATEDIR/items" -mindepth 1 -maxdepth 1 \
+ -regex "$STATEDIR/items/$1[0-9A-Za-z]*$")"
+ if test -n "$1" && test $(echo "$1" | wc -l) = 1; then
+ echo "$1"
+ return 0
+ fi
+ fi
+ return 1
+}
+
+abs_path=${Request_URI%%\?*}
+
+case "$Method $abs_path" in
+ "GET /"[0-9a-z]*)
+ if item=$(find_item ${abs_path#/}); then
+ content_type=$(cat "$item".content_type 2>/dev/null || file -ib "$item")
+ printf 'HTTP/1.1 200 OK\r\n'
+ printf 'Content-Type: %s\r\n' "$content_type"
+ printf 'Server: %s\r\n' "$Server"
+ printf 'Connection: close\r\n'
+ printf 'Content-Length: %d\r\n' $(wc -c < $item)
+ printf '\r\n'
+ cat $item
+ exit
+ fi
+ ;;
+ "POST /")
+ content=$(mktemp -t htgen.$$.content.XXXXXXXX)
+ trap "rm $content >&2" EXIT
+
+ case ${req_expect-} in 100-continue)
+ printf 'HTTP/1.1 100 Continue\r\n\r\n'
+ esac
+
+ head -c $req_content_length > $content
+
+ sha256=$(sha256sum -b $content | cut -d\ -f1)
+ base32=$(nix-hash --to-base32 --type sha256 $sha256)
+ item=$STATEDIR/items/$base32
+ ref=http://$req_host/$base32
+
+ if ! test -e $item; then
+ mkdir -v -p $STATEDIR/items >&2
+ cp -v $content $item >&2
+ fi
+
+ if test -n ${reg_content_type-}; then
+ echo -n "$req_content_type" > "$item".content_type
+ fi
+
+ base32short=$(echo $base32 | cut -b-7)
+ if item=$(find_item $base32short); then
+ ref=$(echo "$ref"; echo "http://$req_host/$base32short")
+ fi
+
+ printf 'HTTP/1.1 200 OK\r\n'
+ printf 'Content-Type: text/plain; charset=UTF-8\r\n'
+ printf 'Server: %s\r\n' "$Server"
+ printf 'Connection: close\r\n'
+ printf 'Content-Length: %d\r\n' $(expr ${#ref} + 1)
+ printf '\r\n'
+ printf '%s\n' "$ref"
+
+ exit
+ ;;
+esac
diff --git a/krebs/5pkgs/simple/kpaste/default.nix b/krebs/5pkgs/simple/kpaste/default.nix
index 9820c931d..de2de4721 100644
--- a/krebs/5pkgs/simple/kpaste/default.nix
+++ b/krebs/5pkgs/simple/kpaste/default.nix
@@ -1,6 +1,7 @@
{ curl, gnused, writeDashBin }:
writeDashBin "kpaste" ''
- ${curl}/bin/curl -sS http://p.r --data-binary @"''${1:--}" |
+ ${curl}/bin/curl -sS http://p.r --data-binary @"''${1:--}" \
+ -H "Content-Type-Override: ''${KPASTE_CONTENT_TYPE-}" |
${gnused}/bin/sed '$ {p;s|http://p.r|https://p.krebsco.de|}'
''
diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json
index bd1ab98c0..d9e81ad37 100644
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/NixOS/nixpkgs",
- "rev": "645bc49f34fa8eff95479f0345ff57e55b53437e",
- "date": "2023-04-19T18:04:47+02:00",
- "path": "/nix/store/jh86824939585dinrs1zlkh6cvz8l8l7-nixpkgs",
- "sha256": "0kfndc7xdkm89yl0f27wdnwd6gdad3i49jx7gvaib1hz0ifpmxzv",
+ "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
+ "date": "2023-05-06T22:28:42+01:00",
+ "path": "/nix/store/55lpvam2wgdmrbzx0j5gf51dqrqn8wqv-nixpkgs",
+ "sha256": "0i9j45jwmqhiv7v8i4dmigaras3iw4hmrds2vvd5x8riln3hyizn",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 7e478e9cf..4ba72d00d 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/NixOS/nixpkgs",
- "rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
- "date": "2023-04-22T11:27:49+08:00",
- "path": "/nix/store/gpfv5hbki6g1b63nqw7md5bjlcpzsz1w-nixpkgs",
- "sha256": "1fd7xyfna0klfbv37qq1ms2j4gzjpy14a8vbnw1i8ix6fijkywjf",
+ "rev": "a08e061a4ee8329747d54ddf1566d34c55c895eb",
+ "date": "2023-05-09T12:11:35+02:00",
+ "path": "/nix/store/lwy9r49c92ml9mbvp2kx1m31p7bcpzxd-nixpkgs",
+ "sha256": "1h0yd0xka6wj9sbbq34gw7a9qlp044b7dhg16bmn8bv96ix55vzj",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/lass/1systems/aergia/config.nix b/lass/1systems/aergia/config.nix
index 6992db4a5..d49040a7a 100644
--- a/lass/1systems/aergia/config.nix
+++ b/lass/1systems/aergia/config.nix
@@ -65,8 +65,4 @@
];
boot.cleanTmpDir = true;
-
- # vbox
- virtualisation.virtualbox.host.enable = true;
- users.users.mainUser.extraGroups = [ "vboxusers" ];
}
diff --git a/lass/2configs/paste.nix b/lass/2configs/paste.nix
index cfd7f5576..87768a452 100644
--- a/lass/2configs/paste.nix
+++ b/lass/2configs/paste.nix
@@ -82,14 +82,9 @@ with import <stockholm/lib>;
krebs.htgen.paste = {
port = 9081;
- script = toString [
- "PATH=${makeBinPath [
- pkgs.nix
- pkgs.file
- ]}:$PATH"
- "STATEDIR=$HOME"
- ". ${pkgs.htgen}/examples/paste"
- ];
+ script = /* sh */ ''
+ (. ${pkgs.htgen-paste}/bin/htgen-paste)
+ '';
};
systemd.services.paste-gc = {