diff --git a/nix/apps/website/default.nix b/nix/apps/website/default.nix index e61608c..a64a2ed 100644 --- a/nix/apps/website/default.nix +++ b/nix/apps/website/default.nix @@ -1,25 +1,23 @@ -{ pkgs, lib, my-projects-versions, ... }: -let - website = import (pkgs.fetchFromGitHub my-projects-versions.website.fetchFromGitHub); - blog = pkgs.fetchFromGitHub my-projects-versions.blog.fetchFromGitHub; - slides = pkgs.fetchFromGitHub my-projects-versions.slides.fetchFromGitHub; - website-build = website { inherit pkgs slides blog; }; -in -{ +{ ... }: { + services.caddy.globalConfig = '' + filesystem garage s3 { + bucket noratrieb.dev + region garage + endpoint http://localhost:3900 + use_path_style + } + ''; services.caddy.virtualHosts = { "noratrieb.dev" = { logFormat = ""; extraConfig = '' encode zstd gzip header -Last-Modified - root * ${import ../../packages/caddy-static-prepare { - name = "website"; - src = website-build; - inherit pkgs lib; - }} file_server { - etag_file_extensions .sha256 - precompressed zstd gzip br + fs garage + # TODO: run precompress script + # etag_file_extensions .sha256 + # precompressed zstd gzip br } ''; }; diff --git a/nix/modules/caddy/default.nix b/nix/modules/caddy/default.nix index bd5f448..24d1418 100644 --- a/nix/modules/caddy/default.nix +++ b/nix/modules/caddy/default.nix @@ -4,8 +4,9 @@ let caddy = pkgs.caddy.withPlugins { plugins = [ "github.com/noratrieb-mirrors/certmagic-s3@v1.1.3" + "github.com/sagikazarmark/caddy-fs-s3@v0.10.0" ]; - hash = "sha256-HdCXbqrrGPZSdHv7bZvGz9T6loVbrfKydTbjTyt5Wt0="; + hash = "sha256-wHxwRimtLCd/lhF5IQloAZoCfXgGEnkgeI77ObdG7cA="; }; in { @@ -25,7 +26,7 @@ in age.secrets.caddy_s3_key_secret.file = ../../secrets/caddy_s3_key_secret.age; - systemd.services.caddy.serviceConfig.EnvironmentFile = config.age.secrets.caddy_s3_key_secret.path; + systemd.services.caddy.serviceConfig.EnvironmentFile = [ config.age.secrets.caddy_s3_key_secret.path ]; systemd.services.caddy.after = [ "garage.service" ]; # the cert store depends on garage services.caddy = { enable = true; diff --git a/nix/modules/dns/noratrieb.dev.nix b/nix/modules/dns/noratrieb.dev.nix index b14b131..69c36a1 100644 --- a/nix/modules/dns/noratrieb.dev.nix +++ b/nix/modules/dns/noratrieb.dev.nix @@ -60,6 +60,8 @@ let }; }; + garage = combine [ vps1 vps2 vps3 vps4 ]; + # --- apps docker = vps1; hugo-chat = vps1 // { diff --git a/nix/modules/garage/default.nix b/nix/modules/garage/default.nix index d50d3c5..bec56ba 100644 --- a/nix/modules/garage/default.nix +++ b/nix/modules/garage/default.nix @@ -53,5 +53,12 @@ in }; environmentFile = config.age.secrets.garage_secrets.path; }; + services.caddy.virtualHosts."garage.noratrieb.dev" = { + logFormat = ""; + extraConfig = '' + encode zstd gzip + reverse_proxy * localhost:3900 + ''; + }; } diff --git a/nix/my-projects.json b/nix/my-projects.json index d17941d..aeeebce 100644 --- a/nix/my-projects.json +++ b/nix/my-projects.json @@ -1,29 +1,11 @@ { "website": { - "commit": "57c4a239da5d17eafde4ade165f3c6706639a9b4", + "commit": "bf24af343128c6ac4e4b7d1034315df28121dab5", "fetchFromGitHub": { "owner": "Noratrieb", "repo": "website", - "rev": "57c4a239da5d17eafde4ade165f3c6706639a9b4", - "hash": "sha256-or6mCQjbc7tWAzzAKQpznZv+2vWJMhyzqxBPwRE2HKw=" - } - }, - "blog": { - "commit": "ea2758dd10f29e8d66ca3f54d7303f2ac20005d2", - "fetchFromGitHub": { - "owner": "Noratrieb", - "repo": "blog", - "rev": "ea2758dd10f29e8d66ca3f54d7303f2ac20005d2", - "hash": "sha256-LvQ41eJzOvI7mLYDTvlFwGZ2TKrZO26rasydqnEZ/t4=" - } - }, - "slides": { - "commit": "0401f35c22b124b69447655f0c537badae9e223c", - "fetchFromGitHub": { - "owner": "Noratrieb", - "repo": "slides", - "rev": "0401f35c22b124b69447655f0c537badae9e223c", - "hash": "sha256-K1Me4wf/GSfoc1PGWVJygPyTVV8SXienxUrzXkdCrjQ=" + "rev": "bf24af343128c6ac4e4b7d1034315df28121dab5", + "hash": "sha256-lmOyHLWBCurLuN8J9sRCO082WRqL8+/OXN6W4Jq8W/8=" } }, "pretense": { diff --git a/nix/secrets/backup_s3_secret.age b/nix/secrets/backup_s3_secret.age index 4dccf37..5812754 100644 Binary files a/nix/secrets/backup_s3_secret.age and b/nix/secrets/backup_s3_secret.age differ diff --git a/nix/secrets/caddy_s3_key_secret.age b/nix/secrets/caddy_s3_key_secret.age index 00e655f..3ef9493 100644 Binary files a/nix/secrets/caddy_s3_key_secret.age and b/nix/secrets/caddy_s3_key_secret.age differ diff --git a/nix/secrets/docker_registry_password.age b/nix/secrets/docker_registry_password.age index d673c45..9761e6f 100644 --- a/nix/secrets/docker_registry_password.age +++ b/nix/secrets/docker_registry_password.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg kxQujT+O6ZGlzTONdS/18DUVoxNapwtxitQo8GKr2hc -b7KjCjuvhmWcqNB6BvNruL17Ww6yWkVKjjm/MGd+jlE ---- q3EzroLr8b0T2gKQ4xUR67YOLSwFP1V8UxAnKY0PP24 -l0g1CXqi{Ttg͇߭ەߑEs5hxk- \ No newline at end of file +-> ssh-ed25519 qM6TYg aOAjlUp3G75gqvm+LVZhhAg45oJsobkyDTLY49b/zRU +pogMMIptbR/b1RKM3uJxEHT9WzSyZSHFQjAsNvcSAYU +--- t29inWsEHgMh0rx6BGbMBBvCy9wrhxqLmssWUBgZAxA +Izb"bD۩Pd@fŽveŗpk* e diff --git a/nix/secrets/forgejo_s3_key_secret.age b/nix/secrets/forgejo_s3_key_secret.age index 9e4e8f3..b08b423 100644 --- a/nix/secrets/forgejo_s3_key_secret.age +++ b/nix/secrets/forgejo_s3_key_secret.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg yxVVZ7LOgN9NiKsl1+dN7Rp6Rsf0zlqb25Y6w43styk -gQ5g7TL8+lyGp0SxdcoRg0nTpu1w6WbZZK0ERyqRpkc ---- 5uKpMbkW4zZ035mNXCuty+64IZ360gly/ezxnwtRX/0 -ˁSϸ>q!O߷TCUҺ[*󅬟\w݋tcg? |B;"*dWv/vnqe \ No newline at end of file +-> ssh-ed25519 qM6TYg QhiVyWtk2dq2YqG+wQFWaZLFHQo05mBd92IKwxMjqhQ +nOLu8KsLxTOKBGggph/qy3Y1sTsHoWFajEQ3XFf2ktA +--- x9n+BLZcUdhVJ1nkUWcYL2IFztoiItD0tI5AfScS68U +sj١H'ǁZĿo@ݶtowZ/Z #bU0+e`X\ M"y+ :^քC@U+L \ No newline at end of file diff --git a/nix/secrets/garage_secrets.age b/nix/secrets/garage_secrets.age index d9d0ee2..39b3bdd 100644 --- a/nix/secrets/garage_secrets.age +++ b/nix/secrets/garage_secrets.age @@ -1,14 +1,14 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg L6XQVJyw/T2kwH2iOa3dAxwxlAInVTKXek5QHUKsU3g -Mm8VXH3CITbrJTqBcjdMHGm1k7Kztd4irHqWnF0yKWM --> ssh-ed25519 91VHug 2PoHH6c5lVj6hfTH6+2NLzJcpXh20LgYgUHYrpY9Wg4 -iSaKgUoh0eSjeoiZ7mggn7LWV9C9xsM2foZrpJZY/ok --> ssh-ed25519 XzACZQ xyYG90gHM9XHAxIv2cFU/WvZsdLo6prAPQgRKADP0UY -XdiJz1Zmh3S+IvaOCZBqrF8DSWBrrqePjy+ZiEwuaSA --> ssh-ed25519 51bcvA IYyt435x3NPiTKDKCVb8dIK5naOSyU/Wh7dOLQ6SRAM -M0s39vyjDY24Mlb16UHy9lFEseaJxzZhtCvszKxwVSA --> ssh-ed25519 vT7ExA ZBvUjCU8vYFddKgNfnuROuiDnDXhitG6eR6ek4+1R1E -fiyuqamkakZ4t1MosIUqZaR0WEh7XVAwJiwH8lz3bsc ---- zvHNHd6bOMd0f3eIrl1qzyRh6zUe7G8mdrraYGtrnXU -%iFrљ`|)+ώܝSGNP>?E{֦mdadj`ԈVunZֻXU旽}>j_D_; 5Opa; -~4bwZ'70^2+wZ0j;4yTdp1'9 7Zsb.J *(yW _Pg`S^Gr \ No newline at end of file +-> ssh-ed25519 qM6TYg 1WRiwfAjRtvM4SNe0Kb39CNjo3HbOTAyFtqxLCtbmxs +IvaCCjpo61RBYwcUz/QPNFmxZaD+F48LIs6ojdBqxok +-> ssh-ed25519 91VHug 0FQFOLE2YZF5GGqcjaHap9t9z6xvyVkY3kzsUlU9cSI +j9hGw7d+UCkOaN4K/GGChDdQUsFDt0kw+bj/+QP6xiU +-> ssh-ed25519 XzACZQ tGQdswquRCp+iXrYXHLlg64DC/lor2QvgiWY10Shkg4 +ejl3+e9EVGyS+oP3161B0VdfXup9RPeyWI8wHJliHEw +-> ssh-ed25519 51bcvA La5y55eSktxwiIQaNOzEIh8QFTv7MvToPVNefwgpAFg +e+mKIU1sMXbQmZ2EUGEAAV4vdCIY24MM1/EGrNBn7+c +-> ssh-ed25519 vT7ExA McL/w6ZheS2TkmfyrTsdbdtT03hsHuqMx6VwpMtHDF4 +uBvctWaqmECReOwyW7rT/OsEn9b8qaivo4n5RQ3Cabg +--- AITRERll2MxhVYGt8EIbYSOlEDfCTfRm2/jvgvvPbqY +(CopvjI5le\<َ>6x$i%.OxQyrŗ7 +[%2DYđNTp& &.FL?Z[O(P@xj[)F \ No newline at end of file diff --git a/nix/secrets/generic_backup_password.age b/nix/secrets/generic_backup_password.age index c666d43..c5f7aa6 100644 Binary files a/nix/secrets/generic_backup_password.age and b/nix/secrets/generic_backup_password.age differ diff --git a/nix/secrets/grafana_admin_password.age b/nix/secrets/grafana_admin_password.age index 59a4c17..363d61c 100644 --- a/nix/secrets/grafana_admin_password.age +++ b/nix/secrets/grafana_admin_password.age @@ -1,6 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 XzACZQ OeTS5wU4ac+Qh7s1PXbdFH3LDlRW1LV+qFtoVGI47XQ -JsixYPLzpnF45ODQH7nuVowXzwbNQi8lWx1Bp2YFVWc ---- MEG4bfGwoFRm9HizYdqtK7KApYhYH+QjAIEp7CpLznA -C/wC -Fz?MkrxN'NTzWb{Aj3X6mݲJ@OI{u?A,C d^ \ No newline at end of file +-> ssh-ed25519 XzACZQ kPs0o1RyOBiyicD/j76VTf+ZEF9qgl4OXGbsJKupwlM +s2z+UPLm1r+GUcKd3Mh+M+cOaCiGxtKwqTFlSoWQLeQ +--- 7+XH7gdCThNz812SwfS4V4xBacSGPoOhIJCt7NYR++s +ĝ X?+^DΙw{Cϸ1V]㒓w?%өkSߧ5NG)*- F2HA&Z=,*C'z- \ No newline at end of file diff --git a/nix/secrets/hugochat_db_password.age b/nix/secrets/hugochat_db_password.age index f5e1cd0..bde5cd8 100644 Binary files a/nix/secrets/hugochat_db_password.age and b/nix/secrets/hugochat_db_password.age differ diff --git a/nix/secrets/killua_env.age b/nix/secrets/killua_env.age index 3ac6770..1d8a07e 100644 Binary files a/nix/secrets/killua_env.age and b/nix/secrets/killua_env.age differ diff --git a/nix/secrets/loki_env.age b/nix/secrets/loki_env.age index f55d3a3..3fa1a61 100644 Binary files a/nix/secrets/loki_env.age and b/nix/secrets/loki_env.age differ diff --git a/nix/secrets/minio_env_file.age b/nix/secrets/minio_env_file.age index e1d3f36..834b52a 100644 --- a/nix/secrets/minio_env_file.age +++ b/nix/secrets/minio_env_file.age @@ -1,8 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg k3jtd2qoiQCsKZYJliH9ySFuO7CVQQ5Sv2ikFYcaD2c -TSIg6y4C2WaLQJUyNT3HQOj09VmKSkQxlsVlaDc+1tY --> ssh-ed25519 XzACZQ NZhP9TD5nYxBMgO1O3vDOITeh7qxq4vhjG7AppQmRlM -I1JiT8ISWLVUgoCphHSbhYvfssfP55NuBI2jclG3DVQ ---- 6UR3wbSTB/f0s8hP/YHaY9HFDpnLAts0yksKCv7p9BA -ig502LQkL -vÛB$5m #{_8j&+;Z-'ƒWHSыaf?56[t8&Z_/3B_4n \ No newline at end of file +-> ssh-ed25519 qM6TYg rrAASuKrjVYunxCZCyiGI94hiIcnj5tCZgtrNwDM6Dk +drt/hxV1oD6F9km2P6ODRl48o7Z5DzNxZzGp475gJdk +-> ssh-ed25519 XzACZQ aC2p4JKStZyOBcAOxKMHm1CubsILvhLm0AADzYEPB1Q +rTIR+IXgD+65JmE+GNTmZUHYwjOasbHMyS8amWLr+6M +--- Lq0EHVDsbHi5jo6xHl8tu5lNmlm/4+gmQCXDzJ/RJ9c +A P #&h.$3hm/TߖilG٥\)&h ^HaQ;F>\ҬH%tF%ogxSaF|XwLgfټC +!' \ No newline at end of file diff --git a/nix/secrets/openolat_db_password.age b/nix/secrets/openolat_db_password.age index 4073e15..654f947 100644 Binary files a/nix/secrets/openolat_db_password.age and b/nix/secrets/openolat_db_password.age differ diff --git a/nix/secrets/pyroscope_s3_secret.age b/nix/secrets/pyroscope_s3_secret.age index a2c7dd5..ad31ff9 100644 Binary files a/nix/secrets/pyroscope_s3_secret.age and b/nix/secrets/pyroscope_s3_secret.age differ diff --git a/nix/secrets/registry_htpasswd.age b/nix/secrets/registry_htpasswd.age index de9e94a..d52861c 100644 Binary files a/nix/secrets/registry_htpasswd.age and b/nix/secrets/registry_htpasswd.age differ diff --git a/nix/secrets/registry_s3_key_secret.age b/nix/secrets/registry_s3_key_secret.age index fbd3450..4430ac3 100644 Binary files a/nix/secrets/registry_s3_key_secret.age and b/nix/secrets/registry_s3_key_secret.age differ diff --git a/nix/secrets/restic_backup.age b/nix/secrets/restic_backup.age index 0465e54..3f45f9c 100644 Binary files a/nix/secrets/restic_backup.age and b/nix/secrets/restic_backup.age differ diff --git a/nix/secrets/s3_mc_admin_client.age b/nix/secrets/s3_mc_admin_client.age index 3e366bf..1199207 100644 Binary files a/nix/secrets/s3_mc_admin_client.age and b/nix/secrets/s3_mc_admin_client.age differ diff --git a/nix/secrets/secrets.nix b/nix/secrets/secrets.nix index 8e25b6b..798b55b 100644 --- a/nix/secrets/secrets.nix +++ b/nix/secrets/secrets.nix @@ -28,6 +28,7 @@ in "pyroscope_s3_secret.age".publicKeys = [ vps3 ]; "restic_backup.age".publicKeys = [ vps1 vps2 vps3 vps4 vps5 ]; "generic_backup_password.age".publicKeys = [ vps1 vps2 vps3 vps4 vps5 ]; + "website_s3_key_write.age".publicKeys = [ vps1 ]; # only used by Noratrieb/website GHA "wg_private_dns1.age".publicKeys = [ dns1 ]; "wg_private_dns2.age".publicKeys = [ dns2 ]; "wg_private_vps1.age".publicKeys = [ vps1 ]; diff --git a/nix/secrets/upload_files_s3_secret.age b/nix/secrets/upload_files_s3_secret.age index 3bca9a4..059b568 100644 Binary files a/nix/secrets/upload_files_s3_secret.age and b/nix/secrets/upload_files_s3_secret.age differ diff --git a/nix/secrets/website_s3_key_write.age b/nix/secrets/website_s3_key_write.age new file mode 100644 index 0000000..4bccbd0 --- /dev/null +++ b/nix/secrets/website_s3_key_write.age @@ -0,0 +1,5 @@ +age-encryption.org/v1 +-> ssh-ed25519 qM6TYg 89WLUVxmODcP3iwW/dRLUO2/4Q3qmuFU8rqfWI2ENRk +o65QiUjc42lO+nMkmO/PWTBMdJAjTho/PUWDv6ymgw8 +--- LOxBuiZaR+Dp/x2IUucWqWGW454w5DcLzD3LzQE+jY8 +&M @fh ,'xw` ocQ56G'!y8>6XhyuvP3[|7KFC9zI8w_Yk5Z7?/H,u`jbԪYb?;\O[[]^ #ߣ \ No newline at end of file diff --git a/nix/secrets/wg_private_dns1.age b/nix/secrets/wg_private_dns1.age index a54f3eb..cfb217e 100644 --- a/nix/secrets/wg_private_dns1.age +++ b/nix/secrets/wg_private_dns1.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 LZU5Eg o+MPatbYPM3sZq0MCqvvxlvKMQwlbajHURPQ+0g0qm8 -UUurAYkPWXCaow746EV4dAQ+qTJnHIehcorUmanBc+o ---- BV+bxd0OIc3J4uT39al2odyn8ScDpq58SiwnW5pvRj4 -T7W |fJ%"cq{TP~fv,;:免-Ϛ4a -u\L_-VH% \ No newline at end of file +-> ssh-ed25519 LZU5Eg vEsVLUdg/m+EWIX6pdlKH3xPNRoEzQLG34SjUU3dP38 +OiTw/STEWVuZDmaSWuhUDjlty5NCXOYal9GrhitOgJA +--- acirsYbJtNaJGlfGf2Ukapl66fvaqQmaYcU0agfRjPg +Yy> +ZmNRVס,@q}{5zoep jز\wB&7 ) \ No newline at end of file diff --git a/nix/secrets/wg_private_dns2.age b/nix/secrets/wg_private_dns2.age index 64b2ad2..b712c12 100644 Binary files a/nix/secrets/wg_private_dns2.age and b/nix/secrets/wg_private_dns2.age differ diff --git a/nix/secrets/wg_private_vps1.age b/nix/secrets/wg_private_vps1.age index 6354b7b..69f3e29 100644 Binary files a/nix/secrets/wg_private_vps1.age and b/nix/secrets/wg_private_vps1.age differ diff --git a/nix/secrets/wg_private_vps2.age b/nix/secrets/wg_private_vps2.age index 4d30264..a924ba5 100644 --- a/nix/secrets/wg_private_vps2.age +++ b/nix/secrets/wg_private_vps2.age @@ -1,8 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 91VHug cjq3el2rlJCWS3VwM5Dt22Ot/PoCdU5wJWTMosYQ6VE -w/IyVNNAObRJxpV162CojPRE8yYbXJj1kaCBoPo3rNk ---- EDM/kgV9ewXhMvrQfHDtPLl7W46VCbZL5ciBO/B+Iu8 - cL>&²=^$m T4& -ƧI) -c -LQi6RS +T@0= \ No newline at end of file +-> ssh-ed25519 91VHug DSVlC+Y9wXBRTPtMeyGNsqTGN6p2j9GDcJZyVoXqmRM +dCEnH6wtFCD4QaNf6Gph4Ic9mEwr+GukB7GBJiMKCsU +--- o8VhUzFXGMSoFL/zHICEjK4qr+HozGzGrx+R/FLCJbA +Ll[muu V\NǞ +/egPT >fZ}zK<L#IJ} \ No newline at end of file diff --git a/nix/secrets/wg_private_vps3.age b/nix/secrets/wg_private_vps3.age index a63f54e..341a7b2 100644 --- a/nix/secrets/wg_private_vps3.age +++ b/nix/secrets/wg_private_vps3.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 XzACZQ lm64+fQEWa9hF98cV/x1U3Mz+6zuM23dAV3XkwE7iz4 -7Rgqd13DThp/JLryCe5xTdXwDujaTj4viR2CBTdXYLs ---- pwebssA2O2VjzPFRAQ0/65+qiiF/MijCIIXexwH5mgk -\fv̤[ڟI[5*׷90'4+V;L~j ;S2yb \ No newline at end of file +-> ssh-ed25519 XzACZQ //MVwFVmv8J0fNDH35jA/wRYWEwBpTNeuqb22JDlQ1M +WxQNXyyaOwR+jbLEd6qul81Tcy5ZmC9xQzXLdokrdBM +--- 4hvQvXwTU3vuYYkO1cud43LbDvFKfzSY+HB0nEfQbGA +HʹTԖ,2ڵG2tI| 4jxz 7) iNw,IN ҄wbpnF VA \ No newline at end of file diff --git a/nix/secrets/wg_private_vps4.age b/nix/secrets/wg_private_vps4.age index dcf6aaf..cf963a0 100644 --- a/nix/secrets/wg_private_vps4.age +++ b/nix/secrets/wg_private_vps4.age @@ -1,7 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 51bcvA mVJPirZJQxHgpX6CkMckYTpJk6HYN7CZYlUPPF1mYDM -XVZqovyalftEtV//FQM11Za+YAEMAuBTypcPQz1+G3E ---- 7QAtADWyWr8SY3jLLzKxPsedOLyasfLs4lK3nmhkOi0 -]JXtE)hSF -$2"Ta`Į{:= - \ No newline at end of file +-> ssh-ed25519 51bcvA afHu7io35iOiA79ghD+kTKgaiLv7t4UDH3MY4vc57kE +ZW0xYUH9bqD3vFWvmWT0LMGdcbnqFHafdO0/EakU29k +--- oMTnoSLV3ZvjjEjIbJpFp37Twz7GbljLuhrPfyYzvVU +M9__:2b_%c ee>`uSJiQz\]$c[ӽVud4 \ No newline at end of file diff --git a/nix/secrets/wg_private_vps5.age b/nix/secrets/wg_private_vps5.age index cbd582e..25eb7b6 100644 Binary files a/nix/secrets/wg_private_vps5.age and b/nix/secrets/wg_private_vps5.age differ diff --git a/nix/secrets/widetom_bot_token.age b/nix/secrets/widetom_bot_token.age index e414467..f65d2c0 100644 --- a/nix/secrets/widetom_bot_token.age +++ b/nix/secrets/widetom_bot_token.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg oaTrhtYhEl2Za2fhNt0BgnjXPCkzo1Or9jsLLCnJhzA -Wk99OfMEXXG+cV1LEvC9wf0GeVgT1Z2GA0AtLYCRKD4 ---- 4U4dwN+tJ2LFpIjxEaoZ6HHV5QQU4kr0r0pDXKKcTgE -N]n?!|!:Ml* '?EM@r_ivo:Nilk8S(:֊R/0^xi[xC \ No newline at end of file +-> ssh-ed25519 qM6TYg oOHHqlwmPvW9l6F125mS5u7iJ2hznWVpZrVh9Gs9SkQ +M8Xbif6Ts+upr+ri6X8H6JviwYhZhZsL41eMNCOIJo4 +--- PXmESo/wbek0iXWltDKEUzQFt8ehaYinWqzlm2nTPvg +`TKshiiO AD.sY9ٍf~FDG^yש՝va{m-P?TT`(P A<0 \ No newline at end of file diff --git a/nix/secrets/widetom_config_toml.age b/nix/secrets/widetom_config_toml.age index 4d13ac2..f02bb7b 100644 Binary files a/nix/secrets/widetom_config_toml.age and b/nix/secrets/widetom_config_toml.age differ diff --git a/secrets-git-crypt/caddy_s3_key_secret b/secrets-git-crypt/caddy_s3_key_secret index 955a6d8..63db25f 100644 Binary files a/secrets-git-crypt/caddy_s3_key_secret and b/secrets-git-crypt/caddy_s3_key_secret differ diff --git a/secrets-git-crypt/website_s3_key_write b/secrets-git-crypt/website_s3_key_write new file mode 100644 index 0000000..3ba1e60 Binary files /dev/null and b/secrets-git-crypt/website_s3_key_write differ