diff --git a/devshell/commands.nix b/devshell/commands.nix index 7c94988..f62203c 100644 --- a/devshell/commands.nix +++ b/devshell/commands.nix @@ -37,10 +37,10 @@ in command = "rm -f ${homeFlake}"; } { - name = "agenix"; + name = "ragenix"; category = "utilities"; - help = pkgs.agenix.meta.description; - command = ''exec ${pkgs.agenix}/bin/agenix --identity "$PRJ_ROOT/.keys/dev.key" "$@"''; + help = "age-encrypted secrets for NixOS"; + command = ''exec ${pkgs.ragenix}/bin/ragenix --identity "$PRJ_ROOT/.keys/dev.key" "$@"''; } { name = "qemu-genmac"; diff --git a/flake.lock b/flake.lock index 5e6ff45..ecf3e87 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,8 @@ "agenix": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "ragenix", + "nixpkgs" ] }, "locked": { @@ -124,6 +125,21 @@ "type": "github" } }, + "flake-utils_4": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager-stable": { "inputs": { "nixpkgs": [ @@ -242,9 +258,31 @@ "type": "indirect" } }, - "root": { + "ragenix": { "inputs": { "agenix": "agenix", + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1672569413, + "narHash": "sha256-WedPMfZ3rPTkxMrvvpMjYaZntlbfilJly9Vaf2fGuAI=", + "owner": "yaxitech", + "repo": "ragenix", + "rev": "2cc694606c3eec2ce073892f8ea13d5f3def8217", + "type": "github" + }, + "original": { + "owner": "yaxitech", + "repo": "ragenix", + "type": "github" + } + }, + "root": { + "inputs": { "deploy-rs": "deploy-rs", "devshell": "devshell", "flake-utils": "flake-utils_2", @@ -255,12 +293,38 @@ "nixpkgs-mine-stable": "nixpkgs-mine-stable", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", + "ragenix": "ragenix", "sharry": "sharry" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "ragenix", + "flake-utils" + ], + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1672453260, + "narHash": "sha256-ruR2xo30Vn7kY2hAgg2Z2xrCvNePxck6mgR5a8u+zow=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "176b6fd3dd3d7cea8d22ab1131364a050228d94c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sharry": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs-unstable" ] diff --git a/flake.nix b/flake.nix index b63f465..983646e 100644 --- a/flake.nix +++ b/flake.nix @@ -17,8 +17,8 @@ home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; # Stuff used by the flake for build / deployment - agenix.url = "github:ryantm/agenix"; - agenix.inputs.nixpkgs.follows = "nixpkgs-unstable"; + ragenix.url = "github:yaxitech/ragenix"; + ragenix.inputs.nixpkgs.follows = "nixpkgs-unstable"; deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -83,7 +83,7 @@ pkgsLibOverlay myPkgsOverlay inputs.devshell.overlay - inputs.agenix.overlay + inputs.ragenix.overlays.default inputs.deploy-rs.overlay (flakePackageOverlay inputs.home-manager-unstable system) ]; diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix index b97a495..46bc198 100644 --- a/nixos/modules/common.nix +++ b/nixos/modules/common.nix @@ -16,7 +16,7 @@ in imports = [ inputs.impermanence.nixosModule - inputs.agenix.nixosModules.age + inputs.ragenix.nixosModules.age inputs.sharry.nixosModules.default ]; diff --git a/secrets.nix b/secrets.nix index 99ad933..cf3a14d 100644 --- a/secrets.nix +++ b/secrets.nix @@ -3,12 +3,12 @@ let inherit (self) lib; inherit (builtins) mapAttrs attrValues readFile getFlake; - inherit (lib) optional flatten zipAttrsWith nameValuePair mapAttrs'; + inherit (lib) fileContents optional flatten zipAttrsWith nameValuePair mapAttrs'; secretPath = p: "secrets/${p}.age"; defaultKeys = [ - (readFile .keys/dev.pub) + (fileContents .keys/dev.pub) ]; secretKeys = zipAttrsWith diff --git a/secrets/chatterbox/nul.ie.signing.key.age b/secrets/chatterbox/nul.ie.signing.key.age index b35556f..2260e6e 100644 Binary files a/secrets/chatterbox/nul.ie.signing.key.age and b/secrets/chatterbox/nul.ie.signing.key.age differ diff --git a/secrets/chatterbox/synapse.yaml.age b/secrets/chatterbox/synapse.yaml.age index 0101ed9..bf13546 100644 Binary files a/secrets/chatterbox/synapse.yaml.age and b/secrets/chatterbox/synapse.yaml.age differ diff --git a/secrets/dhparams.pem.age b/secrets/dhparams.pem.age index ab7db92..a966388 100644 Binary files a/secrets/dhparams.pem.age and b/secrets/dhparams.pem.age differ diff --git a/secrets/estuary/netdata/powerdns.conf.age b/secrets/estuary/netdata/powerdns.conf.age index 9133721..3492501 100644 --- a/secrets/estuary/netdata/powerdns.conf.age +++ b/secrets/estuary/netdata/powerdns.conf.age @@ -1,9 +1,13 @@ -age-encryption.org/v1 --> ssh-ed25519 n8CpUw 3b8J/xL277WAajHymjDJobariLmoDAhUyQpLdB9cfXo -i3vbIUk+NawecuYN24PYPkeCcPU6tcSv2uyeThUXLxM --> X25519 e7KpW0DuROUPbJnwH9bmuukI4CssFChIlGiQZ9eJ2m8 -95FinF9t9H14AaWEsZrboHvVjDpawT438N8x0u9aqEM --> SQ-grease yKgA| >{Zf` %\ }#]TR;rx -ufI0F4kKHxaxb6ulmD2nwef1y9I ---- N9HQTIQ5VVZI/MQnddn+iic0NpcXDVn+y+TsdJmqfYM -gn=j>Od: OJ0N^ˤU~ (Q ^:0BdFB=v[ .MC2ʿE=Y/%K|Cڵ}&!w>}o S??^!Bв \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBabUVB +UU9YZlR6U1Y1QzQzUFZzckRlaUFqOXFVcHd6MGxIMUtNOFBFanpFCjNNMm5IMDhC +b3NhTEtzNEhVQjN0Qlc2eVMyT1hkbFB4ank5Q3FjYlZZWk0KLT4gWDI1NTE5IEtH +N3drQk83UVY4QTlyZXoyZW9iNTUrOGltY1FNUFFPaTh4S1MwZjdrWFkKeHBQTTB0 +NW9FZitHQjljSUhJVFJpcXJaMEVMdkRlbFh3bURuVWQ1NDdrVQotPiAxaHI2YlQs +Qi1ncmVhc2UgMH41JmdMTSA7ClhMSjcrbStmd0tlRjRPQ01aRmR5eGJZaTBpeERa +ckZOdGJZTjc5akRYSTFhZEhEbTJ3Ci0tLSBkQklsYmRBTlM1cmI3UGY0WlR3Vk1z +MVhCdEVYSE1sWG1EMjR0emgvWG5zCm1KLVursm7T3lrS8BkL/u/o5o9L3wm/4Muv +q1yYWnUOqHrPiX63gNyVi79daqagXtIpxfX4Fl/eHsAWc+zL0GmNooLWRi/p/n/o +rrIbnYoJcZadB6p/xSS4QJpT3rqKnsJ96DGs6MvEZYOGulzq4gX0ZuK0xsy044nt +kmAYx0Sl8MaNuNdGDkSxiqH7UFyVgnNwCyo= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/estuary/netdata/powerdns_recursor.conf.age b/secrets/estuary/netdata/powerdns_recursor.conf.age index 4fb8a64..ae85694 100644 --- a/secrets/estuary/netdata/powerdns_recursor.conf.age +++ b/secrets/estuary/netdata/powerdns_recursor.conf.age @@ -1,11 +1,12 @@ -age-encryption.org/v1 --> ssh-ed25519 n8CpUw 6uHZyoyVt2gGwiKcnXNoYKhKRe4VoruWKEKKhDZGWE4 -Koe5ZXD5VXbxN54uhLAZgjOJDd898gxoAv8eug57n6A --> X25519 7HmjFGzmHrcLL4OoylHByV9HQEjLoHJI3aL1KQPa40U -kmlyNDJy4wZUlQuIMYXjGGa8goX6p0kqCmctcvjhZg8 --> Qt-grease -gFRjzic9zrBNWUd/9b8dcMhrf4I8B2dsXFnkXMJJ/QTXH3Vwo0x78VQrcsDCBeFQ -bFoadWMaFb8tiEzOTUmL4D3v8cUoQNik ---- 5K/uMQHfY+rbs+XlqWjPoIkZWiNcaqcd2PJxwbDP4GI --?KsaeIJޖM1Z3T0"-Q;t~*oTSu %-?ƈ ssh-ed25519 n8CpUw 1h5DOKUmcFLWvD09R9Hg+kPtKskdJuIS0/Y+TJ4XlRs -tD9fRfDHl/CPjeN17xAWQhd1KWcoqDmf6bstgb6HRsU --> X25519 vt8XCj+Ju/TeP7JwEZrofUtatTRjxD3ROngwQbTkhzE -iKSnIjHuYy3apf45NZ6kLgIV5dVIhc4fOCflVh7D9Sg --> @\)-6C-grease vcL@ yq^]X -08U2EyiwGEU9t+P4s8Vu+mTH7UZuaDCUpiv4w9KbTGV+dAe2Fw ---- ux9a8/Et2aI1Lmkmvn+xkemaWcW/wghIb/Jcz/h6rNE -Ŏc_Q1bMNB \DTm`.\*[҂x֙JSH# yDnz}%6' \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBLbXdz +a3NiUEdhcmI0dGJzbHR2U09lOCs5cGFIM2xseFFVY1N3ODdqVXdjCnlDMXhCdHFn +UXFuT0wwMmJqMTRvUHhORlkzN3l1dVZlTXZHNEZtSHVYeFUKLT4gWDI1NTE5IFVB +ZkZWNHFDaGZta1p6K0NSejY5VVE4K2xYSjRVdHZIRURKbGVwQ0RYeG8KMHdtL3oy +bngybWh4L0xLRmxnclRzMmVhMHFOTlc1cnN6N3Z3aTNCQlNzQQotPiAkJ0J7LWdy +ZWFzZQprdGxmalQvTzliRWdhQ3V4VXVRcU4xNTd6bjdnb1pzZnFidEp0bXNIYkdG +Yjl5Ry93bnl4dWxKZlZrdVVGV0x4Cm55ZlhuN1EyZXoydmRjY1k4OUR5QVdPaUdq +ZllwcjFsV01FSzBLU2dnMEZieWlzCi0tLSBydTh6ZDZzcVplL3h2UWJNWGkxaXlx +cDhObjh4VnJTZzJMV2F2K2JST3prCnkLOrS2duSr8wrOIwuHOyernU55jBhisYJY +cD0zWyWeicjK5SsjyMNVN2cNRofCWsFLAjQMJNlo2wmu9hj9FM83okxP/Dq7M0Jw +0w== +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/hercules/aws-credentials.ini.age b/secrets/hercules/aws-credentials.ini.age index d885eee..7dc9f6c 100644 Binary files a/secrets/hercules/aws-credentials.ini.age and b/secrets/hercules/aws-credentials.ini.age differ diff --git a/secrets/hercules/binary-caches.json.age b/secrets/hercules/binary-caches.json.age index f31f327..e6dab03 100644 Binary files a/secrets/hercules/binary-caches.json.age and b/secrets/hercules/binary-caches.json.age differ diff --git a/secrets/hercules/cluster-join-token.key.age b/secrets/hercules/cluster-join-token.key.age index 1ac8211..2ce3879 100644 Binary files a/secrets/hercules/cluster-join-token.key.age and b/secrets/hercules/cluster-join-token.key.age differ diff --git a/secrets/jackflix/mullvad-privkey.age b/secrets/jackflix/mullvad-privkey.age index fbdcda3..85db757 100644 Binary files a/secrets/jackflix/mullvad-privkey.age and b/secrets/jackflix/mullvad-privkey.age differ diff --git a/secrets/middleman/cloudflare-credentials.conf.age b/secrets/middleman/cloudflare-credentials.conf.age index 20184dd..9b9e229 100644 --- a/secrets/middleman/cloudflare-credentials.conf.age +++ b/secrets/middleman/cloudflare-credentials.conf.age @@ -1,10 +1,13 @@ -age-encryption.org/v1 --> ssh-ed25519 VFcw5g G01nloJG2Wdyi1gSSOEp6Zn4s6fCUaPXoNCArG/uuE4 -dC+Jj+DoHHQsvL0RSlLw2OpH7Ml0vMQqcVLc7m1dmyM --> X25519 cG9p7CWWySixwURxm/Y8Z2B1NALSVufLiIhf8sSbrRQ -jlmJhd0L/KQMeus8WvR9+9Ia+tIaMN0yc/wIomkPyVA --> 3)i39L>-grease @ -B6mVojZRP4YS6+0Lj/k6N1YaHmvlCFMDF3E7YlDue08Rqcqhvapew4DExmRpvZMY -Vi6M5OkFgNY7vLSrrdPz8t7+0SIqw8TWmv6+BtVp/glFDmPMYBSsYmI ---- WrKnpLU6puEiBBmmTP/Xl+u6J90wuxHbt4YM+Ly/ou4 -C!~jK cɒbfJ4߃) 4W~gNv&3?%aF|"g9D<_­N&'S ^!_vܻX/*e4It[;k Mmo2 \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyB0TElo +alZnQzM0aXNiNlIwZGd0M2kwMjgwc0Zwc0R4bG0yeUFLK2tzRncwCm1UVU9UZW5t +dFA1V2pkdG5hZFFzcFZLL1Y5WUlETUhvbHFNQTh1M0ZLRGcKLT4gWDI1NTE5IFNy +ZlJkb2M2QnJhNWtUMzhJMjZpd0dvQ0YxOGFqQWdnb3FMcld0WFA5aGsKenRXY3Ri +M3hwZU90NzRRY2JsdkFvaXZQelI4MEN2WXpoUUZXejdMRXpIZwotPiBELWdyZWFz +ZSBefV9YPzMKOWNUNkgzNVRvdWs2Yllqdlllc1h5RlBpc0pIRWhXbWZIK0pma1pH +d0xLL00wUDNsWE1ydTB5ZkRxZ09WYkcwYQpiQVhVS1pXblBxbTIyeDQKLS0tIFBD +YnF3dlVrb0g0V3pvU2RWdjdCMk5EZTRvTmZrbVRvY0trSDhuNC9HRzgKiTKtFQb6 +OMoTfgE4CrOEr3X7JtsFrwgotboiNJ8hYtb1EV3EZk9oVIjpKNkn3ZfmDTUlp4Cx +TS3QJnntcvGZxu+fYNlYx3PBnH5kF0g+g/j2rt0BVtr6ZJa+WaWdXy8jgB2wpdKn +qx3SRBlKYS3duLj5pnQy9GwO4fbrJ18O+NQW6zkzHugN+leaZzjx6Tp9tS5O1x8= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/middleman/nginx-sso.yaml.age b/secrets/middleman/nginx-sso.yaml.age index 8ce5577..8fe805a 100644 --- a/secrets/middleman/nginx-sso.yaml.age +++ b/secrets/middleman/nginx-sso.yaml.age @@ -1,12 +1,21 @@ -age-encryption.org/v1 --> ssh-ed25519 VFcw5g BkhSSXRGxc8l45dH7lDsq4IrP6snH/Eo7a/Rsq9qgEg -15RBdiSiV2+cFxn9+WrOtPjNdof8tUWxDQ8uZit3ukA --> X25519 hq0gvtl7WqZm2tVHo0T9lJV8I4sKxjE5xWr1cQIR9DE -OvKcXGwcsPV5cqaDpDJvsBi5QASp35Bw8LhPmgAnCwI --> >Hǹ~+ńցR4_{.3ntxپPOK!nlI ꘓ-5f$ -IDoe3jdO" =[bs(ϑMȑ6]l@f`O!{tHdU<2QM܌9^?t[F"2kcy%FZg| \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyBpWThu +bXhiSDlaajQ3dndyOWwrS2xsemtnU3ZuTENMWk4xa2swTm1NL0I0CndNOGtzVlNp +WEhjK0pZeEFBb2ppVHNObmhyOW92VWJ2UmhQOEVLenRKUW8KLT4gWDI1NTE5IHJX +bDArL2xEVnZjeHF6R0xNR0d6czQwSHVXbGR1MHJzMmx1VTljYXc2ek0KVmlTb0U0 +YjVtYkk4bnRxWHJPM1JZblVmMEVrQWdIZmwxVDJzYVhGN1FGawotPiB2LWdyZWFz +ZQpraGhxaUx4bmZHMElqUktYUnhqM3lpWDRKQjhlaW8zaUt3ZEpXQzJDVm1PcWFm +R0ZTNFg0cTB6L2piTEsxWEdnCis0ZU00Rm1sWmdtWVA3MW9sL2srSzIwelI5R3FW +V0ZkWGxzZ3RZMnprNm8KLS0tIEhWR1AyS1U4SkxoT0s5QWhOSlhnN0RXVVorcmdr +TWdWVVIwbllCcGJPMVkKIt817snP6b0sVF3ldsgortAgjrZzJETw/0pK/13h3gXN +TWzuxk7pwzFhIPIqzx/842v5PqtyyCJoWli9qu/GKzRc51hgAfhg07Psz93p+Fr+ +U8ZNTnKq0aGjtQww6+OKF40ynmalxOQItrsauXmsL1RUcixb+9jREBMW0zv7JEKu +njuzTtfRwjbHj0Z3pT7sq+9BUQ/4Nizmr1TLfz8/MnaMJtgsSbY30vZ7OXfYcFh+ +JfW2z8vrgMVt+Kc2kktHO8Uq92mpa3osqCCCl+2wTqI9wyVh5zElCsK8tmStrE6Y +KIKqwaP94245vSdBlpVkhI3B0Y1fB4IVSMTKun5NJrHdYgKAyhTk87rrhC/KGIN3 +Sb8stUm7rxJDZorVgV3fSGwDUZIGCcpSZ1AZvo2TeK5Zn9oueJ8VTTK0g7fptRjH +Q8I/dp3zHeHdqA7ayNWwAb3Sxs5Ubky5luSHgbFD8W292QgYUt3moZzsrh8hybYU +ddpIedgRgMqh0B1b1JJCihc7i2haNOGGm7oz4oHD9NoRQP2/LewtPwJXD2A66kMG +A1xMpjW4eb5GFEzF9hSupWuVjLejodp2TMdWg33vA9PY3BFZBC3TuiKGzeDHMWNS +qNjhj14g7y+POOkbFntHON/LHdWER83qcddO+DT+OaUq4qOv5I1T +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/nix-cache-gc.ini.age b/secrets/nix-cache-gc.ini.age index d788734..e0b700d 100644 --- a/secrets/nix-cache-gc.ini.age +++ b/secrets/nix-cache-gc.ini.age @@ -1,10 +1,12 @@ -age-encryption.org/v1 --> ssh-ed25519 BaQlRg 8l3eJWU58/aC8yXoCudDZlk0h/gLa/1a0mDwhDzliDQ -gYFLF9lgPHXg1zuLvxdm+vxQsZ/3JZ2aJHhcrrmbTTk --> X25519 DxzxHQM8VFuTNo/pFV5K3bTICUS6N9sY9zpzQVVQGXU -d0H0oszySMDHBPLe2v5jqeWPGzPGBoIlorsddDLCPUI --> U-grease -TvQg+kxmWSLSfG7VXECqHgk7PepdgLV12BKIUwBsm/swsAdwvhmJEh0ysQNUqHwa -g9Y2WFl6C28/T45JHdXlrkqTGA ---- dJH44nXQTORRm3PQv5gOXpDeExwl9On3ScRqNedZvqo -~b-:۰m_e|2~PMQyrUZgDM_biijLʽP-BVӛ#Q.XoOҝ \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEJhUWxSZyArUG4r +ZHpHTS9GRC9WdVJUY1BCTHBYbVFobWYyaHpZOHBTZVNUUmh1TDFvCjZiNGRlT2Zy +WXhNZ0wvQkY3Tk5SSlBvN1JqWkVYemt6Q3NqMWJYYkhZeGMKLT4gWDI1NTE5IEhx +ZFFpSEwxM1FVK1U1Y21BVDY1bmFxWmh2MkpjcmdJbWQ3MUlDY0k4VFkKd3hhNCtD +TXdnUXY5TFdQM01UUmw3ejNUa0RGQ2t3L016MEhzM1MvQjNSOAotPiBwbU5iLWdy +ZWFzZSBZal42dW9hIDF5THg4VTI1IEo3IDpEQQo3L3l5TzZKdU9FUDFtWCswN3gv +STVxUGFhQnRwNXBadzN1eEE0L0lFNjNNa0FvbHhrZwotLS0gRm8yT1MyUjNSdjU5 +N3lmMFE4UmI0VlhDL0E4Z3FGb2phRVhJRzM2Ty82TQrp5RgdqTThRar94vbJHfzD +n9gS0S1ikeK4RyDcdDToZb369pPDO09Wirf0bI51wj+xuWjVnGNbjwzXElTyLYPM +3099G/hDsBRAi7/X/FVnUeR46hUVaRhShxLb +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/object/minio.env.age b/secrets/object/minio.env.age index 5353d50..267edf4 100644 --- a/secrets/object/minio.env.age +++ b/secrets/object/minio.env.age @@ -1,9 +1,11 @@ -age-encryption.org/v1 --> ssh-ed25519 hkbtvg Q4CZiI/MwoTZBk67anCC2EEHcDKyF56kkqQOp/ZA93A -4xYbLhZQ4BRmssOWkPZPiJtxwOEU/du7snFWwZ1uPk4 --> X25519 drkbQMNZjhVz/mTTYDORpI7dTJfFiKK2QG7z7/XpfUE -797KwkieoVEVYk0ksStaWsvZp+5xOvJfk7ViZVGs30w --> K;p8b;"-grease -0l4VhRcURlNmHh0/cwsW8wnb/8IH1gQ3DMdL9z4bvyQ8CDxObKVQnp+5wdPI ---- XCucOLzU/lDGs034cHr96Csxx755Tfi0eGDw3JP8UCY -3(tc(,[jaJ,Ay8PQ 5+`_Atv]4HJĒiW,D(#$aǸIz[fw8 \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyBieFMv +czlXN1U4cGVvYytPSC95cnQ3ZGdGcU44QkkxWFRsOG5Gb0tQTXdNCmtNWHR1V1hw +MWhJbXRNWlpEVW43eEJpSnR6YmFsNVRCcXVNSzhNbmlML00KLT4gWDI1NTE5IFl0 +YTgweVFBbit5cHVwL3BWT3pKLzhja0JWT3NXUFhMczRsckIvQlh4M2MKN1ZTQTEv +QXk3SmxhUVBxUHF4czNaT2xUbXRkOVpRNFg5MFVua3AzNG1lSQotPiA3VkN5LWdy +ZWFzZSAhIFxzIEgjNWstVF0KOVVTN3R5OGp0Y21CK0o0Ci0tLSBSVDJpVTR5bzR3 +a3poYStrTTNLcXBVWmxFNjNxQ0crOFlCaGMrTml1QTdZChPw5301VvlGOyBDoohF +Mkp/MPbF7Z9j0KJleBv5px6Q25pBepXMnADd9XqYh2pcbm2JQdBJi1bCffCHauj0 +VphsTczSaTlFBQlK1bQnvGYh1845yx0xd4FHnOqR6Q== +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/object/sharry.conf.age b/secrets/object/sharry.conf.age index e722c6c..1bd340e 100644 Binary files a/secrets/object/sharry.conf.age and b/secrets/object/sharry.conf.age differ diff --git a/secrets/pdns-file-records.key.age b/secrets/pdns-file-records.key.age index c7ac09e..b3200c4 100644 Binary files a/secrets/pdns-file-records.key.age and b/secrets/pdns-file-records.key.age differ diff --git a/secrets/toot/otp-secret.txt.age b/secrets/toot/otp-secret.txt.age index 4353420..afcbb7e 100644 --- a/secrets/toot/otp-secret.txt.age +++ b/secrets/toot/otp-secret.txt.age @@ -1,10 +1,15 @@ -age-encryption.org/v1 --> ssh-ed25519 62JccA hYLNjdUSu6k/3UWmZ8KUWGgp8oCKg8mXuWbssRJKNGk -bixOLSjVKS4HCC4BpH3FVioqfrZFKu1gU3CrFR5GLxI --> X25519 SPjyPzWZhxysp+orn9MRLbMgF0bmGJrCyEhwYuGwfA4 -ar3h3erVZheWkRgd4si/LFKrJGhsxFNvP+hpcX4UAyA --> ;>8csh04-grease -2MVNSFMb/p8+CPGD6yJypa3hAXylVl9V805WrBXP8mGy1AYrg213xqiUKhHp93BB -VuT7rcCaurSxmusUwAoflUowUZ/bWBn/ ---- QzLGsIO6xVPKIxS0kKn9h6yl4tx4jGHgDqKHR/WtCF4 -e0 AiΉ xy2INCISPf rpN8dśF,ZP8jcHRri}N h+x.6i9h13dž?'­5!ѵ͸Иu \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBsSCtB +cm56YjhDNm0vS0RsUWk1dnpidmFJWjljT0t5NkU2TWpialR0YjNjCkpyRjV3d1Rz +c2xIQkx0NEZMODFrMVJzMFRjbWVwMHNoUkxoYjdTdnhTUlUKLT4gWDI1NTE5IFQ5 +akJRdDBpdkg4cklTWE9Mc0hpZHRQUDZzZzRKTzNvQ1pFZTNNNGNCaHMKYnFnb24z +aUZrcXg5djVYd2RyK2xrWkxXdThmZVkyQjM3ZC9qY1VBay9CQQotPiAlfmItZ3Jl +YXNlIE1PQmFwSikgfH03XWkgPl1waFgKN3owcW1ScnFpWkRwMkplNTBHdmpNYSs4 +eUtBM2w3NVdhZk1yOTdwVjJBcC80V0FKTk5yOW1QTVBNTzNzRmUvVAo5TVRHcm9D +bzVRQXRBY1pwbWU3M2pkaUc2ZG82dm5pMzJMVWhFV3RWaTF5ajlvMGZ5ZDQ5TXhj +K0Rxa3RWaWpzCmJIQ2IKLS0tIE56RjhSbVl1QjRWcUJoeUF3YjdHdUxrOGJHdWFO +L2pCYUJtbTVxYjlkaEEK4zLvf6M6XP3E17IJh//8CGYbpWgC0WV0Zy7auhnB+WHr +htzwedCGSN8SeNrZ9WXlfukcfvXf6I4xfz2/Pbc8s1HfCk9eZ0rUzAaNXrIxjPTZ +vM///DJvdK+AHyz/2iAOO/ZCsmuhW0h4DD6kS/Nv56uLjT6Ym+eie7KqmgGPCxC7 +qoyWb8U28UuuY7dEpGnFCKz/CiTE5IkoeGDhPOhlXOk= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/toot/postgres-password.txt.age b/secrets/toot/postgres-password.txt.age index e56e3a4..8998a12 100644 --- a/secrets/toot/postgres-password.txt.age +++ b/secrets/toot/postgres-password.txt.age @@ -1,10 +1,11 @@ -age-encryption.org/v1 --> ssh-ed25519 62JccA QhhGF5N6sMP+P3IdUpmJzNRz2Hm00ZncbuakeU8iQU4 -YF/OzLaTwVHF6TAiQ0DS62T4YB6mbzwGUBKiC57tttQ --> X25519 Pm6IdBMnfg2dXyShGK/rab40kgaHntQl2i1+U6mdXDk -juv9BOJ30uI4i86v1FK0mD2m09FO1H6fgBS3Hd4LKc0 --> ?U`0-grease -tBHyO/6iUm7Dce1vJeez7ojMHxyBtgBCX/GoFkvZR5MbC0L0lwDaKYV/iNtyI/mz -lX65tP5ZM0RRMb8OduMLOtd0fGz0SO2CwlwyVbMcYptJoFvH2Nk ---- 8StTTi8cIRWmha1obVORyGBiSga4pIocUrKMiNHPIEk - M\ 0me AfL>4}2^vkP#XR \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBteGhw +MzVNSGd2SHpzS1VsQnAyV2NOTUkxV2VFQUhYOGd2eEc4dU5iazJFCmswcHBJamMz +dUlSMkgxM3lYK2I5YUlrUGhweDFTcGREaTVWUzVhTmU3TWMKLT4gWDI1NTE5IGo2 +OXRjbEg3L0RYamp1Qy8wU2JjUkl4ZkVEZ2hTME5Hd3hwMDNwVUh4ME0KQ0NQU0cr +MW5OL29kK1dyTXVZV0hFRFB6MkFQVlArdDM4T0FmWkJvc0xXOAotPiBqLWdyZWFz +ZSB+IGM/IDVrO0dyIDcsbX5dTQpCNCtvYStwbzdjWVBJQmlDdVdSVnJyWm1STHAy +ODgrb1VoODlFa1AvVU5yYXBpYzlaMkEwV1cwCi0tLSBMM2JNQ3F6cVl0ejVzVGpU +RkxUSXZUT0FWSzJERHU5cE9QM3NZVEZVckg0Cghimxo5atISwODr5YHwDwFfXUxx +0aPr/icSP3mr96aALSVu8zrkxcn2n8bQpiQhgcs= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/toot/s3-secret-key.txt.age b/secrets/toot/s3-secret-key.txt.age index cbeb244..ad16f86 100644 --- a/secrets/toot/s3-secret-key.txt.age +++ b/secrets/toot/s3-secret-key.txt.age @@ -1,13 +1,11 @@ -age-encryption.org/v1 --> ssh-ed25519 62JccA 5pH4eHN72U1/YuyqlT8f7+K2LflVAcSmdhgcYJaEbA8 -h6Psi0r7rQ3vR4QidV31ooOQDSz/jDU/JONG+v7g/nY --> X25519 wv8cuge1iRgd/wBUDPsEIxveR2/POc64KKS7l9vGSjc -rqcKowLY3seymydklTmQoLORb3H47Oqmg15hmu3Q+UM --> ;=-grease \K*OpV -yJ/JvmkgmjspPcq5QckIB9zgSbHVPHhGUnvAWDlp4l8DJPFZfyj+u43eAr5z2q08 -I1NF/kRRj4rdinLFRlAI8fKCQj6ifcZ7vg1fe0CB/QRTx/4t6ekJp05z/wRP7ZLz -vw ---- sUj+V1ze8uxcObXJOPYsk/F8bz72vUWrj7VM9BLC478 -h(ڤK^-㚂QQͯD@`l! -ۀ -* \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBiYisw +d1htUy9SbWtqaVJZcFVoRGwweUFPSjMyS0xZVjkzVmo3V2JaWlNVCkwwb3ZCQmRl +ZEpSN3dPTVlOK292MjBEdHZqKzUwdE85Sm9XUUZPZGNWT1UKLT4gWDI1NTE5IHVY +RE5rcDdhelFZU3hmamtFSXNIQTZzN2FOWjdGMHcwOXlBZ0lRNEdqbUEKNDhvYjQ3 +OGtKS1pDeEtsdE1xZThiVTZOOHQwZ1BDR0dJYldNVTA3MHB5SQotPiA2bWU8XC1n +cmVhc2UgdHpvPQpJeFRkZVZJSC9oV0M4SFo5U09PK2c5N2tIRTV1cGNMckxoOUx6 +NW1kZHVXN29YaHI2ME5CYXBzeVVsZDMvRlljCjhkRyt3OWgvU0VBalFVdnF6UQot +LS0gR3J1K3lIaUlldzh2NFp1bUVpeG55aTBhd1VzOUNvb1dqTEUvVmpnTDNaSQok +KC7KK9U8zMH35D7xJleZmfkEMEs1JWulN93ecnon8QAq7ln68NWJYmR8Kg76u9Wo +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/toot/secret-key.txt.age b/secrets/toot/secret-key.txt.age index 4a43a23..f09a68d 100644 Binary files a/secrets/toot/secret-key.txt.age and b/secrets/toot/secret-key.txt.age differ diff --git a/secrets/toot/smtp-password.txt.age b/secrets/toot/smtp-password.txt.age index 121a7ae..38c8341 100644 --- a/secrets/toot/smtp-password.txt.age +++ b/secrets/toot/smtp-password.txt.age @@ -1,10 +1,11 @@ -age-encryption.org/v1 --> ssh-ed25519 62JccA CMVPtLHq9uZiwxGStO2uG2EjdIsDtT8EBpg+FqcpwRk -BdpqFObr1lIpFSI8JGbw2ZY7ytCzHJbnlcG1inENwC8 --> X25519 p0bB1J+ilWsouqw0WfzUShDHdHYE4rDYypT8WIhx12k -FnQGRuclUZQyv6EgXGS5whj0oQ7cXuWBVPb8SNYRFrE --> yIy>EDE-grease eYO +;!yF] cv#J vMrf -XglB4bN9hrclLT6HDgyggakuIg ---- hZbvazlSkllx3S//GGiCiKiFzIqpczGoyYutfa+ACBo -(Eg.=i -(u` "Qd@׽+[eZ# \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSAzR2M1 +QzRMQjR2c0Z6WnpqWVdKSmE0RlBITE5Cd1NGcC83OEs1NVR1emxVCnNqOFJWSDFu +b09KRlpDblNUbThRSTZxOTJMTHIycUh6VXVqODdxdmhFWVkKLT4gWDI1NTE5IHZG +VjJ3K0tkbUVLSXNxQ20vbzZsTEQ1bWdNWGUzalMrREl3SlhYN1lRVjQKV0xoTXFn +OG1IK0dUSkZVZWlMNTBtVWJqV2dpOGVEMm9mQTZ4akR1NGxjWQotPiByI0k6W1ct +Z3JlYXNlIDkKdVkvck9nRmRtU05PMmtOZ3dKWDVzbzdIOGV3T3FEM2h5UTlvalEK +LS0tIDQwVE1rWG5BVVZwYUNZd1FmYlo5emlWWnpzTUxwNEJ4dUJFMkZBNXlFVXcK +PVPdhK6yUJngv8YjVhuQO1beIEPhe0Qo1Du8OwZI98UDfZwayEAFqRIMKqmeIPtr +Bg== +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/toot/vapid-key.txt.age b/secrets/toot/vapid-key.txt.age index c4c74fc..6b7070d 100644 Binary files a/secrets/toot/vapid-key.txt.age and b/secrets/toot/vapid-key.txt.age differ diff --git a/secrets/user-passwd.txt.age b/secrets/user-passwd.txt.age index a3d54bf..51c3b93 100644 --- a/secrets/user-passwd.txt.age +++ b/secrets/user-passwd.txt.age @@ -1,33 +1,39 @@ -age-encryption.org/v1 --> ssh-ed25519 ZB3e6Q FNFu0cH/I6pSHstGsGt+Oznt695FzrDHikyWt8jKB3g -SmZLHlWozqacg3bD3gL8cwJDE+Y+NKqsI4CoNgqFTUw --> ssh-ed25519 j67FXQ Gixk4lYDdv36hsYKXk2vx9XH6CT0/MVSnlGY113wW3Q -/vho8iO171CV20ebw7v55/jHlIsU8Jw1uBTQhxWb0iM --> ssh-ed25519 c0TNaQ p/EFOzkr6yRFReQx0qyx20aedMtlU50tCL8MWcWvKXI -oBZjOzwx1SH8DPc2wj89zZLKKEcgIBPmajHvKAbIjcs --> ssh-ed25519 n8CpUw 7iAxJdJEAV0qJumwlC24FU8ZOGDe/1TZyoINgaL/bCs -MJ/lEvGo9LsqvCyGSdP0mtzOmtGRuCZy6ZbaCjxx4xU --> ssh-ed25519 hMa4nw W4t5q20RG8JzaRebWzZwO+UZFMdlBL3b432BZfSSwEk -vJzpaLNuuWg+bci241OHkVFNynL3fy/VivTzUKpC5Is --> ssh-ed25519 VFcw5g nnQksl6VA/AAzy3t3u22ExwNdGOpoprzUyuh2yUpHnc -A+gTc+BeTiaEMkG/c2UGJpSH7fkXLmrS5ynPFP6Uiyg --> ssh-ed25519 hkbtvg L/7uFBnC/uq76hCfCv0QA47vb+Au4zer3rcq1lvVLTs -rxk3TbJ8uByPTkUqA7ceqlMwHPQc6WcXo+UCpRmxBvY --> ssh-ed25519 BaQlRg 52PDi6EjwMvIUZZaX6720WpzK+4XpMXXCFZA4jgUqFU -y1gy7CIEGtRrlVBZxqEnpIiEgqNIJBrM9KD3FbEvDBE --> ssh-ed25519 62JccA uNJnF4pKYrzCBLp4213KPX9k7buLnz/WJLysX/VvQnE -yVhTQclwCbLxkGPD4+vEmwTJEntoup9hl/m9JwkU6n0 --> ssh-ed25519 /hx/dA pCTKrxoiQW9AvGd6YbJg2jl4Qnh/mEhiKZ48P+IJb0M -xUfsUuvm+ibilRlFf6wZ5nhcriEYl1slGTD9D8buuJg --> ssh-ed25519 HJ/J7A kgveWBep38iC/FPJyQCdvNQMHPAPKI0P+aPTGjigui8 -CVN7YdFo7ju2nPO2dZD5TxoDq+edri/cxwqkTyNyEmk --> ssh-ed25519 /EJXvg Gscj9eppqLwf8kpdXJHwf1C3uJfH/FAfhJ+K8h1/1mo -a0p7cZ5dIH/1aB4BYRkWe1SqPQkfJT7jaH7hSFddcMU --> X25519 RONC7AiQBCvPsdWr94xYWM+ZyE4sjWDfdcCSim6TLCM -jjqBByeH+VApHJdwNs8zN568TRHAeyPsvsB9nePiKfI --> eNacdo-grease CGM -ZedUP0owFszaG+QmnekC7iBusvv8q50qrSsyZhUavXdi1A5IgPlx/1QUuPLfyjeT -c9qEZVkLF1Fo3zlvAsjqn8TZbDCqRl7p5PMCi180Rus1quARwbdl1HzHRgEzJUBv -Bg ---- M5ampVOZa77vEUz54/qFhVH0f35koVhrqck1wDMrISU -3>u"D  7 v:- DiJ ssh-ed25519 /EJXvg LuVK4df8MhZbMVy4+hnickrwf3jzMbIk8QQy+yQewmg -AmmV9iBOS92V9Q0yAdUCNmTJPrvsLvB1HmqNXfwDV2Y --> X25519 ouVt0Q4wwEhyD8HMq0HXYbzKA6Lar2iaQFee2QWggVY -ULL5mW8Wf1i4beanQ2okNsuI4muVywX+J/91jJrBJ24 --> ]-FKc-grease xPu=4!Dc .&# -+ddOZg74w8K2kAIHzCHObn5LfFHI2mlHKESnpbo14hPDQ1T+A7U12LTBx0/HLh/Z -aGESKjoZR9WPoZTXeRT8beJlltQYZQekkebxD7iCo4jKbVZlb5ae9hwoR6HFYg ---- Zp3WIi8ivfjxALtuYrRr2sa8B/LZ2n9OEUWXS6niShE -쑎>ꚲYb2 -yV6oq#RbA!D`:-^ \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9FSlh2ZyBXQ0FD +eXE5N1c2KzdBVmtqbGpCUzNPdmpzWWlJWENUOWFIb0dZQkdzSFhzClVuRFN5aGp0 +bTlLVHJXcTN3L0o0OFNVQThxTmxKL3BYWU1yYmljWnhPSDgKLT4gWDI1NTE5IDln +ZVIzN2x5R3kzWTVNeWFVbWxUN25FaVBqMnZnQ3B6K0pDUkF0d3JGbTAKUEtDSnNB +ZnVGbmZyaGxSTSt3V0wyaHNzRXY4NzdJeVFSMGxpNVlXQlVQWQotPiBtLmRCTHx7 +ay1ncmVhc2UgayBHeFArdQpnWkRnCi0tLSB6dFYvTzlSL2hMVTFucGlLTkVTZ0Ny +clBwZmN3M0s2WU1uOTZOZXhvdTFNCpl4OpYqydEpBdOyIkU4RDTyMYF5EWjPK1kB +lpMMpRTsl7xZZ5J1NvvnMr888wPPcZLk +-----END AGE ENCRYPTED FILE-----