diff options
| author | makefu <github@syntax-fehler.de> | 2024-03-13 21:56:53 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2024-03-13 21:56:53 +0100 |
| commit | 033ebfc37221cfcd2f338775147f822dc4bb2213 (patch) | |
| tree | e1fd33afdb3568c5f48d6811777c1942e170df4b | |
| parent | 9a180b351b903dee05e51faab3127ff0643c6e87 (diff) | |
| parent | e533d64f1f3b8d23bdb15668b37871a603157a85 (diff) | |
Merge remote-tracking branch 'lass/master'
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | kartei/lass/dishfire.nix | 40 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/stable-generate/default.nix | 2 |
3 files changed, 4 insertions, 44 deletions
diff --git a/flake.lock b/flake.lock index 6fba339f5..9a05f5a3c 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702151865, - "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", + "lastModified": 1707956935, + "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", + "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "type": "github" }, "original": { diff --git a/kartei/lass/dishfire.nix b/kartei/lass/dishfire.nix deleted file mode 100644 index 548320584..000000000 --- a/kartei/lass/dishfire.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ r6, w6, ... }: -{ - nets = rec { - internet = { - ip4 = rec { - addr = "157.90.232.92"; - prefix = "${addr}/32"; - }; - aliases = [ - "dishfire.i" - ]; - ssh.port = 45621; - }; - retiolum = { - via = internet; - ip4.addr = "10.243.133.99"; - ip6.addr = r6 "d15f:1233"; - aliases = [ - "dishfire.r" - "grafana.lass.r" - "prometheus.lass.r" - "alert.lass.r" - ]; - tinc = { - pubkey = '' - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAwKi49fN+0s5Cze6JThM7f7lj4da27PSJ/3w3tDFPvtQco11ksNLs - Xd3qPaQIgmcNVCR06aexae3bBeTx9y3qHvKqZVE1nCtRlRyqy1LVKSj15J1D7yz7 - uS6u/BSZiCzmdZwu3Fq5qqoK0nfzWe/NKEDWNa5l4Mz/BZQyI/hbOpn6UfFD0LpK - R4jzc9Dbk/IFNAvwb5yrgEYtwBzlXzeDvHW2JcPq3qQjK2byQYNiIyV3g0GHppEd - vDbIPDFhTn3Hv5zz/lX+/We8izzRge7MEd+Vn9Jwb5NAzwDsOHl6ExpqASv9H49U - HwgPw5pstabyrsDWXybSYUb+8LcZf+unGwIDAQAB - -----END RSA PUBLIC KEY----- - ''; - pubkey_ed25519 = "P+bhzhgTNdohWdec//t/e+8cI7zUOsS+Kq/AOtineAO"; - }; - }; - }; - ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGv0JMp0y+E5433GRSFKVK3cQmP0AAlS9aH9fk49yFxy"; -} diff --git a/krebs/5pkgs/simple/stable-generate/default.nix b/krebs/5pkgs/simple/stable-generate/default.nix index dc9c826f9..31cf6c23d 100644 --- a/krebs/5pkgs/simple/stable-generate/default.nix +++ b/krebs/5pkgs/simple/stable-generate/default.nix @@ -18,7 +18,7 @@ pkgs.writers.writeBashBin "stable-generate" '' filename=$(mktemp) curl -Ssf "$STABLE_URL/sdapi/v1/txt2img" \ -X POST \ - --Header 'Content-Type: application/json' \ + --header 'Content-Type: application/json' \ --data "$PAYLOAD" | jq -r '.images[0]' | base64 --decode > "$filename" |