From b586447af06f911277f65d44c76946356a6edaff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 16 Jan 2023 17:50:20 +0100 Subject: [PATCH] fix attic --- config/nix.nix | 1 - config/services/atticd.nix | 6 +++--- flake.lock | 8 ++++---- flake.nix | 2 +- secrets/instance-20221213-1915.yaml | 6 +++--- secrets/nixos-8gb-fsn1-1.yaml | 6 +++--- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/config/nix.nix b/config/nix.nix index 12f05d90..f76ef1ac 100644 --- a/config/nix.nix +++ b/config/nix.nix @@ -93,7 +93,6 @@ in { distributedBuilds = true; }; system.autoUpgrade = { - enable = true; flake = "github:DarkKirb/nixos-config"; flags = [ "--no-write-lock-file" diff --git a/config/services/atticd.nix b/config/services/atticd.nix index bee06816..1b4b1ded 100644 --- a/config/services/atticd.nix +++ b/config/services/atticd.nix @@ -15,9 +15,9 @@ database = lib.mkForce {}; storage = { type = "s3"; - region = "us-west-000"; + region = "us-east-1"; bucket = "attic-chir-rs"; - endpoint = "https://s3.us-west-000.backblazeb2.com"; + endpoint = "https://s3.us-west-000.backblazeb2.com/"; }; compression = { type = "zstd"; @@ -50,7 +50,7 @@ extraConfig = '' import baseConfig - reverse_proxy http://127.0.0.1:57448 { + reverse_proxy http://[::1]:57448 { trusted_proxies private_ranges } ''; diff --git a/flake.lock b/flake.lock index 663765ed..e5394049 100644 --- a/flake.lock +++ b/flake.lock @@ -14,16 +14,16 @@ ] }, "locked": { - "lastModified": 1673804308, - "narHash": "sha256-e3zmDjZXJO6XA+r/Tg5uzXh4ASPwxSJz8BfpAfGfprY=", + "lastModified": 1673875751, + "narHash": "sha256-iyXrUwIWpE8XtZAXYY0T884w6si3Bxteuut0P8O1I1k=", "owner": "DarkKirb", "repo": "attic", - "rev": "fb77c7eb2b3dbe652a60d7d11f3cfd72dbd9a0f0", + "rev": "c2d1a98e3df16a6c757ea89d2becf28dcd48be71", "type": "github" }, "original": { "owner": "DarkKirb", - "ref": "env-config", + "ref": "fix-compression-field-null-insert", "repo": "attic", "type": "github" } diff --git a/flake.nix b/flake.nix index 3f922677..832bf25c 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ rec { # Sorted by name attic = { #url = "github:zhaofengli/attic"; - url = "github:DarkKirb/attic/env-config"; + url = "github:DarkKirb/attic/fix-compression-field-null-insert"; inputs.crane.follows = "crane"; inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/secrets/instance-20221213-1915.yaml b/secrets/instance-20221213-1915.yaml index c5bb9511..4aa9f472 100644 --- a/secrets/instance-20221213-1915.yaml +++ b/secrets/instance-20221213-1915.yaml @@ -8,7 +8,7 @@ security: restic: password: ENC[AES256_GCM,data:80XNExfwBIG3aVNQBc8T2fdN9oA=,iv:JM/HU7vhx28VA9EppxpFc3xRVcAt+kp3JwTuHmFpL78=,tag:pC73+XCsFGTdA+MbTihD7Q==,type:str] services: - attic: ENC[AES256_GCM,data:smuE5oQwVhKd4z2Famu/Q3n2+tH4fBQ8oyWhROO4pxcsaF/tF+a8VkPQk7AYt4Y6foHjVQ9Wdip3NwDRPElm8iV0R3d636W1xAJf+mXz1GjIINpd5qChMLCqdLI+pF5AGC/CX637G8AwQOsyCdLdCMEC4zzWGS0p3hhzJsKPEi2vnvMXqiw9driilIVy7yHBHKKyYO9G5cx3dpLeWGrm5blV195LFBv7HqsjIW0jE6lC5GJJsr/gkyCW+DcX20+jb3LOSOWjLseD6aMQ6hWEqTubpVEcPqG7+sckj3MPG0FcWL8LTHoO8ckU8ObrcmB5yRNkt+44n2pYUVaaxSjUUWMxucoOvM0luep/8eHF0uimrqR9JJZm0f+q5nXieAlwvY68BbHKUaHjT5Wzh+NlJp1SKWyfFyoV3bkk2l+mKsphQLRNAwYcb5NQsHB0txtJngvW82l3SKCqaFpqUnsSQCgG+HfmG+4clpCuTx99uypVK4W1pV4=,iv:vO7Sr5uBK0DKbpSznYiIbwR+jGD/Tx6fIPmUbXW92i4=,tag:fcPGjMASxsBTp1AOyih2fA==,type:str] + attic: ENC[AES256_GCM,data:piBIi+r/WKVnGwl00q1lZjdyQz2PqFGrM8xTxf5/0MOv4UTJjw9I/9HdQAKgMH7okiAh94BTyGCM4EzwiHRbErQoQC9OihIgUkvQW6/SzIeSgSw3n8oBe7UKiXIedsjzLoPNjH1gDg8lLDgg5Iq389+AY+qPFfmF61tpcG35bkvKd1XWUL/elTMff+yILndu9fvcmmkDk4IGSdzB2fVcB+1k6JOWiL5Mo42RF2dUu7cvbnrsh/MpC0nzMrkQUBENfhPPuEjMGZ2ZwSqbW2B6FfZI9uCtdmRpXhwytzHBgwxetbKKe61a+mPTjSyItG/bqoSw4v+O8T8UBy2y/aAmZjvw+fhl+sb+ro90sOZMzY9jNVenZqVvTyZk12gD/ljpzRbGpIxE9l0WdLLlB9aNIaRa3EGbe9oNpGg4p6I+kEe4mx1+qhUpNgrCpv1jUORyfbKGNrPp//NiO3C7nrm//5D2U+Y4vg4Xc80RHsHTrHuKdpk=,iv:SoK0B7bf8TiFXCPTWYr2G1+XoFzFIIJzruwXfOjCsxg=,tag:bxsUXluNqqcuOixOz6cSjA==,type:str] nix: cache-key: ENC[AES256_GCM,data:e9dQNADhH+8l1hTj+CdVu0gow/LmqrQf0HWiTTlFdY81t/8zWkdHdi0Rat5AKUS6x/oBCfTskIKcoRo0Jc0MYJhmOHtDLXlT+I91bSuxVzb9d+TwmhZ/Zce1yP1OXic+/A==,iv:DZ4yCi4YjsAulDyXl3CDCTXB21p2jZIYuDhHORpTE94=,tag:zXcgyBYgFv229seRDLGzsg==,type:str] ssh: @@ -40,8 +40,8 @@ sops: bVJUcDZLWTk3MiszOWp4enRRQmNsajQKF8QJs/Wb0SqnvsQEkRKlS1Ms9xLIdyvZ QCFAPclaOfaTLTiRJWXjDneBkMBduYKkRPiXCR+Bn7i4z8ixLXFmWw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-01-15T10:59:40Z" - mac: ENC[AES256_GCM,data:CrF9H/JR5+okptMsnfZV2P8naufEcWYeg5s03pQgDc6bg5PWrWwxCkun+gg2xN8dqvH5Ix6JczWyzyDZ/VE/B306IjCCG1USQhIuZdLAUinoGNaSYMtrUIRgRuxNWJd9572jyeG2DBjfp/yQWQi7XZEAmUqTcBjVc2zPA1XjNJQ=,iv:hdjYsl66Gc3YfIFosjtNT3Ek3KKgoMuVOzwZPQ2h1ec=,tag:tKq4o/Ri2aiFlvJY3760oQ==,type:str] + lastmodified: "2023-01-16T11:23:19Z" + mac: ENC[AES256_GCM,data:dNorbYHT4aD7niCGNVCHjFUCGCC3XT/xw5KXDhONfwEArPgOjQJZHzdizWbBM6cm/10uHYV6ctmz0zuY8OEEE/mHt5tbBMGiQJRYYbjKTghbLa9rjSVNGZq+Sq4hBg5SoZ0AN8zPEmDa9nNVn2Y8QEsQdyf4O+XEGDbq5w/j8cQ=,iv:+bkDYSrS/uE89JKQyjByH8OX8b0yvPlfpTGO/f+YeLo=,tag:NQku70062DyWHBmeNlf2JA==,type:str] pgp: - created_at: "2022-12-14T15:34:13Z" enc: | diff --git a/secrets/nixos-8gb-fsn1-1.yaml b/secrets/nixos-8gb-fsn1-1.yaml index c11a1c38..cf7fc78f 100644 --- a/secrets/nixos-8gb-fsn1-1.yaml +++ b/secrets/nixos-8gb-fsn1-1.yaml @@ -8,7 +8,7 @@ security: restic: password: ENC[AES256_GCM,data:8W1pEFt+1lW2/Y11OrJa+glMM1A=,iv:V0R7PlBMxl/oTJxE10MIDMtbqr98bE/po+/92MGMftY=,tag:juGYo8nQy7IJUX28f2ZznQ==,type:str] services: - attic: ENC[AES256_GCM,data:WI2d32HTky8U/dMx3f6Z2hZstshM+NuEYxljVbqjg1HVBMd5CYUh3DYd3c4X6JVwE1pKMbtDhTvBzhkiCS+5udf2nimsRHIzMATXOLDDie2Fy0XR8VVnN0YXizejKyec6czHXX+hju2ggoq07wJBetpEGdiHdq5Wq5hBc2BAcIzCPblwSIVYtu3f33U/buWeObNn9RYKZTZMz07tOMQvIJVvkCavT6KhRyavIdXSaxduBSTyIVtAr/1wEf+4/wFh5sRpl7YVwPJTU+7jNH/8+DYpEBhVMfp2CjGUIWhA4+krfZM8aRPHKzZnFLRQBDrAkQ8wmCwtUrHyGCDGmDSDx2AxDnP/ku+Vs0GSrORgRU8NMc46cqF8opbz7/QsLtEvHrZYZ//6qTz4otrjSXvnBTrS04YaDO17SJ4osFNP10Y6u6QXD/DMSLZeoiUsPFrYcwqteSF8zkjMzN8VqGGC74oAGF6z2QOblj2cRp9+R36PU9md0oM=,iv:B+iI8WFaiahkVrDOFNrTg+HCfQpi8zoR2n1NqkkF6Cs=,tag:FdmjfFUA32CKjwmyAueOeA==,type:str] + attic: ENC[AES256_GCM,data:tIc8U1Bg0id45jWfaEkraUh9kMwfCSxlV/x05eL6A3Y+axyiDneoR9UMR4TLsAlckt5034lMeYJVPRtTmyWaAq61nLX/Y5oVsso7v0WhOaSXwFoWhnp970aQ6MUEMQpwOYxXTqbWsXvxG8sMoJe1MnRP+Yri8TLbEd7AN75yuNy9Le7pCeDblAjzorlzFQCbev6EGMX2YpqXw4QD4thm+zLsqcmZF0c30TREDvHG4o3DUp9MGRStBDtAGDmY11n9OPDKEcDQVDmgi2GohahXMAGCexO+guOfqGxDi42EOoJhzw4W9lCV13cT/Upf/cGZyRVsTxf8lEBL1sft+4lwtVaqloAp5d2KGYo0FWi1nV+wuIJAAOdfStRgg3nfm8YOzLlFq7Azl866Y/0wEwzEZHAtk6uuP+dFJIihxANJqrxtEhipv/wPrI5Ey3gf9yGKxRnExOOpgsSTpPwPmodivr0vuLMTm2/VacVlEQrbzxg4kXA=,iv:jXnIcnWzMjPNCvZHVywJk2jk15Xfi9cy1c2vm2Xuoag=,tag:gWQkcO9995QEPAsJJnIBJA==,type:str] rspamd: dkim: darkkirb.de: ENC[AES256_GCM,data:UZ53jxzBU8pV/64nCVCa54lJwJHng9xsCmvvf0031NaV+zB3LY2Tp1gBAYDkQdDAdJtLw4s6qmt5PoFjNpw4/WD0ZMaTBFMew4BNIQu6CD6CumtBafMPnUKRyRmPccoU/uoeXjsa09sLB/44l3BSqr4nR6wu8JLWD2dH38Tn3KWmT9MuoeHJJFJDpjhhhideFbbLx9R+NvLsIiPLHKNcJZ0/GbLbfDicFVehcqPHaPfVCt2bwKKBm3Qo4o3W56hJnzSKwcY4I9JxcKE9efdMBaYY0yqpSaotqDnuIMl5ZV23+CTsVt6hv8X+o3qEMLQjM3cFhEU1V+LrdTS9peBI+7cb5Sh2py4ICdzptm0BRnbG1HbYBzFWc/YQalffUHlP31Dl15dZkC8HBszNeZ05lb6f116Ehq3qE0aOs4thZeFBMrfPrrnqjrf/P7en4tg6reBmz5CHyQRyrJ2m9eRtw17BpWvf0mnMDBKZ6cKeimvJxXKIt8VNNYqj96aK96qkgGCmrvJ+O1EIgf/Zc1v1UfiZa4UqH8yqyqwulgtd961IKwsE0H5LElok3LX5dGJlhHHGMbAdAmLreXZb7EzKflqNex2lmW1r8rC7ZQ07f0aNpWRCSmUhQ29V77u4K679ODpTBg/zcHBovBHO2XabA3vPDr0tEJLfyD9EkVsrZvnh8ltYQFkDLWkUfgaQg8fa++CIg0iNAyjuoohbMV7JXyVvlYvWLrZslxGzY0nzeD8orpj67s+phUpDYKZgxQtULeyN75COqmABVqknk7DUrG7TlPmRLU+ixcorEjriNHzpXTA7peQ2Q0XCY5gSK6CpvHvYT4k3xSbPfFx0BTeRwMKjHmhG9sNsOtEjfnhleUvcKDDyRVtemF8guhyvJ8B4nY+yxI3kuRBrpkSUxvBSq66cyTEmEfoRtWOqIe7fmSZyu451TL02XJUU96c8QimGLkI8VO4k9PLNL8YUbzAbF/IIjpV362f4JMb9hSyf5bw9JBNhOZNXrFkRLDCgH66XQbYBGS3e4MfZJnLj2x5jzXMPYbrPMZFjtfMEzVDfI+E/nmlrfn3MoHqdiKbV1bYlqIl2F5ldnAvTsBk0fucg5OmckP32ZGA7QsNBbqD16typ8F+69V7JKxo9jH5uY8x2i+lNtNTll5sdh9cuna23zdGywdJDgP/M0hKLlIja5ZzWPyOD34Z40T9A39nHUAyl4AwNFw==,iv:Z1YILn9vpune1u6AvGTb8/5XPjj6hxhb0JJPD3J9CM4=,tag:+mYRcGJbLJQPUNO1Xq6Geg==,type:str] @@ -94,8 +94,8 @@ sops: N1lNTTRhSDFsczd4VjNudUU2NEt4MUEKdVJIJmaoGcwUHa0BGB45jqYnm9aPVZxP dl1vkMx8EAiKhWKbBwQm5fFZcNh371rspGE7KOXmwNbNWef5bVfHpQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-01-15T10:59:48Z" - mac: ENC[AES256_GCM,data:3mteNZoAGCXOG27QEG2Tw1qex3HUQJNcDv65mn7GjqLwO1Hz3wWFouzARt+3c0mM5Zb92sOHORBbYPi8ylkZFgJ+tXTc8CBIqJOC8mI86oMcRjFSJH4OcM1gPSdfYNrdpg5VZ3by/xZbkW0QW44GCXKSjMHC556Ro9nri6DRfvU=,iv:PFEOwAITrKt1/68bu9fsCZkZYGy6zJMenGDrrVzh8/g=,tag:vk21RrC2j2gtmQGKyaM29w==,type:str] + lastmodified: "2023-01-16T11:23:28Z" + mac: ENC[AES256_GCM,data:tV81Zr2MTN26E91/01O9ZWdw5mTLz9PXA8uljS25WENNiwx5krMqEGW+vDSmCek8YZ92QNZ7HHkQYFmldU9iEtVpUgp6faQ2drd1C81l4Pf/iMiTCu8nqgUZERxsFu+RZJtudl5I7ytCAsze7AOOP5LPqm6+H+xqsuTHwxNvQCA=,iv:mHsQCahpk/XDid3NShF66BxDrPy1EiOUvmaus7BA6EM=,tag:v3Gq1q2GKwL70qoiEQEWBA==,type:str] pgp: - created_at: "2022-02-02T17:50:42Z" enc: |