From 3ff48b30577bba1685351b48edd9bc3aaafae619 Mon Sep 17 00:00:00 2001 From: teidesu Date: Thu, 28 Nov 2024 02:20:37 +0300 Subject: [PATCH] chore(koi): migrate pds blobstore to s3 --- hosts/koi/containers/pds/default.nix | 7 +++++-- secrets/bluesky-pds-secrets.age | Bin 418 -> 675 bytes 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hosts/koi/containers/pds/default.nix b/hosts/koi/containers/pds/default.nix index f912647..96f4d71 100644 --- a/hosts/koi/containers/pds/default.nix +++ b/hosts/koi/containers/pds/default.nix @@ -18,12 +18,14 @@ in { volumes = [ "${./entrypoint.js}:/app/entrypoint.js" "/srv/bluesky-pds/data:/pds" - "/srv/bluesky-pds/blobstore:/blobstore" ]; environment = { PDS_HOSTNAME = "pds.stupid.fish"; PDS_DATA_DIRECTORY = "/pds"; - PDS_BLOBSTORE_DISK_LOCATION = "/blobstore"; + PDS_BLOBSTORE_S3_BUCKET = "bluesky-blobstore"; + PDS_BLOBSTORE_S3_REGION = "auto"; + PDS_BLOBSTORE_S3_FORCE_PATH_STYLE = "true"; + PDS_BLOBSTORE_S3_UPLOAD_TIMEOUT_MS = "60000"; PDS_DID_PLC_URL = "https://plc.directory"; PDS_BSKY_APP_VIEW_URL = "https://api.bsky.app"; PDS_BSKY_APP_VIEW_DID = "did:web:api.bsky.app"; @@ -35,6 +37,7 @@ in { }; environmentFiles = [ # PDS_JWT_SECRET, PDS_ADMIN_PASSWORD, PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX + # + s3 credentials config.desu.secrets.bluesky-pds-secrets.path ]; user = builtins.toString UID; diff --git a/secrets/bluesky-pds-secrets.age b/secrets/bluesky-pds-secrets.age index ee2a0003448a085e6d0cdebd90b3ccdb0b529352..b95fde4f48112a2a41d8b477e41b86fdc5d4e20e 100644 GIT binary patch delta 642 zcmV-|0)73W1EU3yEPpsJab$QlQZ-msQgT*SYgs`;M0r&>D@J5&R&q2(c28_{L1{N+ zYB_dAa|&TvL18a9O><>+Z8cRmWlwQJMn-fmR%m!{b2UXaMRI9VXnJE&Sx_-%V+t)T zEg(~LY%nq}c{6uyWq3hhD?(UEF;zHpLoZA@F-2`mS5!nnSASDkWK%O!S!)Uhli|Y$ zuJ%|cdsIwZ$NB(6S~EyE(jYxD%$(Q3uBo?)tlhVt{im*pTl(eYafSXlzAd^5ms}O_ z9Q5-MkOc#NAZi8KLnMU0;duO)p!F`88wW+aR6=MWF$xC5Cu3C5sQwx^s6c8aNU3Vi zEo`YLU>M^GXMYvDFavTrNt$%p@M{D0?TNvqgNoIzkO1u$ayu_$?c6PM-!_L_R+IJr zLRFU~G>mhV<&?xhmE~Ef6Xi10W~+hvXM5e(;&U`k>Tt?Vh9#OU-39_asCDR5o)7Mb z#I*{t#fZWeGBtW@|j@v8@$&4ZIhqg`mJ;P_plk+9s=nyiOE>2_ii=SxdQ}lqFDd$0t zi4r)>Kzll=bpmy0rnA^KRzDzE_+Q#J5v|E2aUhXTb2Aom7yGZXb0Riu0$^p2DHxdr z;_01tfFLf|x)ZGRS{e=^8}ViwQuZN=9jVkHGr0mB3j4XiYZbjkmKsN~XW^%T7ssZl cAQvuhHv!8k-`NDbqv-k(0$Zv(GHrq+GFROoK>z>% delta 383 zcmV-_0f7Fa1)>9xEPq*Zd1GipRWE36W-x7aPc>s^M@?8Zb!jn5d2%sBcsP1#X=YVU zYHDdmI0`{zT1|6RQ7}O=H%DqvOI31WQff|XXiH;aYB*WVo7W{a4UL8Gzu*( zEg)HBVO3dXM@=wyS!_i|QEX2yRY-YDPEkovcW+foM`cG#OMg;OYffoTaX|`kEM{<> z(nrW|+1)kj>#sSpu34uq+{rL(L0){KvrpdDttDbY>x*>=Z~w{EyK1`&8lg1>44xp)d0*F&r1PoTbP7 zaMz#b#d+kfUt;^mpzLQT1OGh9kgvTUQuSwEnA!G-dn(4&SqE(xK}E;&_DXw_3CJPd dCbaV>AD940xG7Uck7`R97TJ9}BqO^)G}8TArL6z}