From fe50a9f715b00d7d14533e7875d538099786c75f Mon Sep 17 00:00:00 2001 From: Noratrieb <48135649+Noratrieb@users.noreply.github.com> Date: Sat, 2 Aug 2025 17:25:18 +0200 Subject: [PATCH] upload-files --- newinfra/nix/apps/upload-files/default.nix | 19 +++++++++++++++ newinfra/nix/hive.nix | 2 ++ newinfra/nix/modules/caddy/vps1.Caddyfile | 6 +++++ newinfra/nix/modules/dns/noratrieb.dev.nix | 6 ++++- newinfra/nix/modules/garage/README.md | 2 ++ newinfra/nix/my-projects.json | 3 ++- newinfra/nix/secrets/backup_s3_secret.age | Bin 662 -> 662 bytes newinfra/nix/secrets/caddy_s3_key_secret.age | Bin 661 -> 661 bytes .../nix/secrets/docker_registry_password.age | 10 ++++---- .../nix/secrets/forgejo_s3_key_secret.age | Bin 277 -> 277 bytes newinfra/nix/secrets/garage_secrets.age | 22 +++++++++--------- .../nix/secrets/grafana_admin_password.age | Bin 282 -> 282 bytes newinfra/nix/secrets/hugochat_db_password.age | Bin 339 -> 339 bytes newinfra/nix/secrets/killua_env.age | Bin 293 -> 293 bytes newinfra/nix/secrets/loki_env.age | Bin 326 -> 326 bytes newinfra/nix/secrets/minio_env_file.age | Bin 397 -> 397 bytes newinfra/nix/secrets/openolat_db_password.age | Bin 321 -> 321 bytes newinfra/nix/secrets/registry_htpasswd.age | Bin 278 -> 278 bytes .../nix/secrets/registry_s3_key_secret.age | Bin 364 -> 364 bytes newinfra/nix/secrets/s3_mc_admin_client.age | Bin 802 -> 802 bytes newinfra/nix/secrets/secrets.nix | 1 + .../nix/secrets/upload_files_s3_secret.age | Bin 0 -> 474 bytes newinfra/nix/secrets/wg_private_dns1.age | Bin 256 -> 256 bytes newinfra/nix/secrets/wg_private_dns2.age | Bin 256 -> 256 bytes newinfra/nix/secrets/wg_private_vps1.age | 9 ++++--- newinfra/nix/secrets/wg_private_vps3.age | 8 +++---- newinfra/nix/secrets/wg_private_vps4.age | 8 +++---- newinfra/nix/secrets/wg_private_vps5.age | 9 ++++--- newinfra/nix/secrets/widetom_bot_token.age | Bin 272 -> 272 bytes newinfra/nix/secrets/widetom_config_toml.age | Bin 4006 -> 4006 bytes .../secrets-git-crypt/upload_files_s3_secret | Bin 0 -> 284 bytes 31 files changed, 68 insertions(+), 37 deletions(-) create mode 100644 newinfra/nix/apps/upload-files/default.nix create mode 100644 newinfra/nix/secrets/upload_files_s3_secret.age create mode 100644 newinfra/secrets-git-crypt/upload_files_s3_secret diff --git a/newinfra/nix/apps/upload-files/default.nix b/newinfra/nix/apps/upload-files/default.nix new file mode 100644 index 0000000..aa108b5 --- /dev/null +++ b/newinfra/nix/apps/upload-files/default.nix @@ -0,0 +1,19 @@ +{ upload-files, pkgs, lib, config, ... }: { + age.secrets.upload_files_s3_secret.file = ../../secrets/upload_files_s3_secret.age; + + systemd.services.upload-files = { + description = "upload.files.noratrieb.dev file uploader for files.noratrieb.dev"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = { + UPLOAD_FILES_NORATRIEB_DEV_BUCKET = "files.noratrieb.dev"; + UPLOAD_FILES_NORATRIEB_DEV_ENDPOINT = "http://localhost:3900"; + UPLOAD_FILES_NORATRIEB_DEV_REGION = "garage"; + }; + serviceConfig = { + DynamicUser = true; + ExecStart = "${lib.getExe (upload-files {inherit pkgs;})}"; + EnvironmentFile = [ config.age.secrets.upload_files_s3_secret.path ]; + }; + }; +} diff --git a/newinfra/nix/hive.nix b/newinfra/nix/hive.nix index 87357ef..6410db8 100644 --- a/newinfra/nix/hive.nix +++ b/newinfra/nix/hive.nix @@ -20,6 +20,7 @@ pretense = import (fetchTarball "https://github.com/Noratrieb/pretense/archive/${my-projects-versions.pretense}.tar.gz"); quotdd = import (fetchTarball "https://github.com/Noratrieb/quotdd/archive/${my-projects-versions.quotdd}.tar.gz"); does-it-build = import (fetchTarball "https://github.com/Noratrieb/does-it-build/archive/${my-projects-versions.does-it-build}.tar.gz"); + upload-files = import (fetchTarball "https://github.com/Noratrieb/upload.files.noratrieb.dev/archive/${my-projects-versions."upload.files.noratrieb.dev"}.tar.gz"); inherit my-projects-versions; @@ -183,6 +184,7 @@ ./apps/killua ./apps/forgejo ./apps/openolat + ./apps/upload-files ]; deployment.tags = [ "caddy" "eu" "apps" "website" ]; diff --git a/newinfra/nix/modules/caddy/vps1.Caddyfile b/newinfra/nix/modules/caddy/vps1.Caddyfile index 38e5607..5260a87 100644 --- a/newinfra/nix/modules/caddy/vps1.Caddyfile +++ b/newinfra/nix/modules/caddy/vps1.Caddyfile @@ -52,6 +52,12 @@ olat.noratrieb.dev:8088 { reverse_proxy * localhost:5011 } +upload.files.noratrieb.dev { + log + encode zstd gzip + reverse_proxy * localhost:3050 +} + ################################################################ # redirects diff --git a/newinfra/nix/modules/dns/noratrieb.dev.nix b/newinfra/nix/modules/dns/noratrieb.dev.nix index c1e43c0..9a4da25 100644 --- a/newinfra/nix/modules/dns/noratrieb.dev.nix +++ b/newinfra/nix/modules/dns/noratrieb.dev.nix @@ -57,7 +57,11 @@ let # --- website stuff blog = vps1; www = vps1; - files = combine [ vps1 vps3 vps4 ]; + files = combine [ vps1 vps3 vps4 ] // { + subdomains = { + upload = vps1; + }; + }; # --- legacy crap old-docker = vps2; diff --git a/newinfra/nix/modules/garage/README.md b/newinfra/nix/modules/garage/README.md index f788a5f..c16f1d1 100644 --- a/newinfra/nix/modules/garage/README.md +++ b/newinfra/nix/modules/garage/README.md @@ -25,6 +25,8 @@ - key `backups` RW - `forgejo` - key `forgejo` RW +- `files.noratrieb.dev` + - key `upload-files` RW ## keys diff --git a/newinfra/nix/my-projects.json b/newinfra/nix/my-projects.json index b709b0a..1a72324 100644 --- a/newinfra/nix/my-projects.json +++ b/newinfra/nix/my-projects.json @@ -4,5 +4,6 @@ "slides": "0401f35c22b124b69447655f0c537badae9e223c", "pretense": "270b01fc1118dfd713c1c41530d1a7d98f04527d", "quotdd": "e922229e1d9e055be35dabd112bafc87a0686548", - "does-it-build": "81790825173d87f89656f66f12a123bc99e2f6f1" + "does-it-build": "81790825173d87f89656f66f12a123bc99e2f6f1", + "upload.files.noratrieb.dev": "84ae7746fd554b18351d377aab8ea6739493d156" } diff --git a/newinfra/nix/secrets/backup_s3_secret.age b/newinfra/nix/secrets/backup_s3_secret.age index 9298136708d6a46d644fee1298fe6f2816b6bbc6..6e4b2ae89ab89eeaad8b566ead2f499e31be941e 100644 GIT binary patch delta 590 zcmbQnI*oOLZoR8Tim63XYCuRzQg)QThk<34U$&!DWkz^no?~cwgn@@)P*J$MadA#0 zS8zyap;@@2qrSGIfmd>YTT);|PE}|@P+?}EYo1qVR+WX1mwQ-1mQSuDm#&>cadC!j zYKoDmsiCDpM3tj+RG@-iMTl`|gim<7QE6U|rM^g60 zkK*BhW)W$@2I-uXpA z6+x!uF4=jG+2$60!O1~c`QeG4PR5bisiuY%+CDz!sp&=DL5`E-8O7_s;09m~TD(tU!9d_uW&b#)bz3ZpE_16-<-f|A@b-F-sCd`cYC z1M-qAf`k1k10&4Ld?V{4&8iCBe0)N=CR8-L+CF{e&t4FASGwZ6jSGVZljm0hm5@Id z*_3YlUgW0qIO@sWMMrjB?OFfKXua~CH&*}te199hX<7DlYni6oXP5+j9yL2?x8jx5 zJ)R{yo@E3uy}h~7H~(~K6*j7PeMmQ&=m7w272aI{ delta 590 zcmbQnI*oOLZhcCCqpw%8musnhdU%y_pkGyDSc;=|QAmcRvq@QGX`;EAg=4yYh@XcE zS5$76zng`HS*B}|X-K}0xkY+tnoFX4u6BrTc8OPZXrxi8nPG62cTj-^m#&>cadC!j zYKoDmsiCDpM3tj+RG@-ohFhqiL0VOosc(sUL3yP|x~qOfMu?-YrCEtZd5UGWPo$fB zp;=*Yg|P)!T0w!QrB}LBv137bRhh55XP!%eaYa>HxlgXMcZO>~W>Kz7o{4dAxJmxR zkK*CM0VU=og_dE-RbhS+QAQ~dIZ>tMRcVFgY1z5ie(B~;+3p6$2B}8*5$Rmz=B8#$0Y?52rT$Tw!HHE-nFfiO1|CHLW~ts@Q6`h)8O7_hOM-(!3oTtN za)N>*w2hsz3j?w}(h4fIv-DGZlU=hzy|PohETYQ2a+A3X(?SbVeT#El-JB!cT|x`X zGX1@RT+C8Z3zFS^T~hqRQuXsIz4R*zvMsoDb#)aAl3hbW{elC-j19^>vLYNaqe??f zGM(L%oC7MeBFbDVstoIWQk_a&0)rg6LOP1%uc*&|>(2bQ%0_r!idJrAOZ83R3ImHb zF80$|lLXzKUfwlbdB$n|8El*a-(plIeT>^O#^ptkb>i_@% diff --git a/newinfra/nix/secrets/caddy_s3_key_secret.age b/newinfra/nix/secrets/caddy_s3_key_secret.age index 6b751789ba3b1f0ac55cf98c2c543dc16bbb548b..a0e5c46344bd48311e3630ba6702541cdd45e596 100644 GIT binary patch delta 590 zcmbQrI+b;TPJKvPvPob?mSs*zvP(&7rKf*EmPe3TNsfnag=wK_MrlrAMpTrWQ<}L^ zHkU_1uBBIrWqD+QUucE4fxc^AW?4vuyGvw_zKeEPnW=|%L4<*inQ>OCE0?aFLUD11 zZfc5=si~o*LPV9Lb5x*0iLra3b7pwCWm2hYQJ6(Wg_~oro1?Rlk6U;^k+!c#VuVp> zqHjS?QDB8HSCvVQiH~`Nn|D@jxluq#hNWMaWub9txoKifm}yFxzmI>8rM|bjaki<+ z#E;_PAyIy%6>br!rosB!k%^X$l|`ZMxv51#W}b<8g^q>Z=1%T;#@hP6g?Z&%IqsHG z{+0!9e%gsSAr|^c`56(x86_Se+KG8tc~uq>Zs~qOenBp#rJ3oI;~B;4JzUE?3PK9P z(ws^Yi^4ohjLS?ajGeu6vdWzzObjaY9ZjpWgENf^Tr$$Rg1w7Mic%}H(=EzFlboZp z{en`{Eh8c$lD&g098F5I482`_jomAQLPLGIbaizVBC^cA6Qhg*^(~T<^D_MMJR=B2eLXTVBhx(sLz4>XGplkc{lW^8xlU=Evsrt$;0yz|J%6;b;@`7Zcv+q1Z#Ox1 z)@2#9%^jiL?~}7{-t&~6>%6UM<}4|nKa(eJ5pS?`sSWHlJtl{|+by3k_;pg0a iM+?78X9X#*dHbQ>oJ)57+~DT(^{vwlej9c$bpZf3ve@hZ delta 590 zcmbQrI+b;TPJM*2cCed;ag@7ug_(PZfwzlWdA3`in~6(Us!Lh9yT7qnet2e4U~*Pq zIhTK+Uw*k$N>aM9r(a%hW}b($cXCFGPg-%Fe}%q#dW30tcvhKDWuTv{Czr0BLUD11 zZfc5=si~o*LPV9Lb5x*$Xiis$XiZzFUc#zl)orx1(`>fm>)*K|zMI zXOy8wg@L;(ms3=zN0xp;rh8&=n5TQ5r<+G&rhbWmS9Y39xIs`}xO=f{UP^M5XKK3V%`$Kol5%k|6F#wlH#b*M|q=i9{18vTp5n6A@3{9Yhj;^yI?y^2CHxz*yW zNB$?9e^*owp7Yp4r?0LzAw|3~>1d9^^nW)syj)MO7P|j@^`dhfH(od|$X5JU9 ssh-ed25519 qM6TYg +BQUq++K4fbTXFQXdZwoVKaeRY75C96A1vnn5gUo5WY -jxUb+nX0t0OIhJxgdaOwTvviVnGoPlAKcmXIRW7FhEM ---- plPYamLI4c2gzNcPkNeEdh68k3i3STrazb5sTG7txUY - GAv°( -\9N -wJ`Y.x.lq 93 \ No newline at end of file +-> ssh-ed25519 qM6TYg QziuzHQxmWyRdv8dUPBWTgnMxFtqR6ttP16Z3XdvD3Y +Krxmha5J+gTU0DjzPDTDIwz1mW0Q84XR2FgQyPm4bf4 +--- t4Mea1Y35o5t2dhREnp8Zq1AyR4DAWMFW7Vv3CkgGKw +lTS+Ƴ6yrOn&c`ϰ :7V-tfpuwIw \ No newline at end of file diff --git a/newinfra/nix/secrets/forgejo_s3_key_secret.age b/newinfra/nix/secrets/forgejo_s3_key_secret.age index 93ae17a69f8ead5fde23e72c5e883c6a0ddc72d5..6bfaa6427554934f5ca465d15493a0f55d8327fa 100644 GIT binary patch delta 241 zcmbQrG?i(BPJL=}sexy*S-y67Wr%r1MpQt)L1dbVS(1Ncs*#UldY+f5Z-rYxNTj~2 z0hd>ymvc#AZb?OYc8PC}zKKV%M}|RZP=S6?m1}-sh-H+8p@(IeVNgV7K9{bpu7bXE zu2WU1OPYaWvU9dskz<)_hG}rFr*B0;xpPQXT9&0}U{*MV6m_PN+v=z9-j@Rg0aurP*`~ zA`Zy^U}9E1dGL2@jnKmg_O71lk9`wXC@VcBS#o@DdH6qKJ00y${GD`9Q%)nh007^-T#^6) diff --git a/newinfra/nix/secrets/garage_secrets.age b/newinfra/nix/secrets/garage_secrets.age index 25936cc..57eb61b 100644 --- a/newinfra/nix/secrets/garage_secrets.age +++ b/newinfra/nix/secrets/garage_secrets.age @@ -1,12 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg dSNo/WHtuVibuLghfNnznYw6+zsMJOWvi7LitHSn3AY -pfZti2of1OZVOgVR+wXZrhGggtZ2W3jyUADDWVxQHfs --> ssh-ed25519 XzACZQ d5+ZaKmyb1yTZJ0mvPYl6On9XaOp8Z59zNQXVtEj6F8 -+Ku4GwagVLPZHzOpkaFPZ1i5NoB9Z+Eyd0tuY28yS5Y --> ssh-ed25519 51bcvA PxNLpJLMnUrlyzKUairI6Y+f6BYn7N9e/OURoiHcWQk -FsXdpP0pM+Xvst93kHIG+KsDlwrRRks4jxl+Q487Msc --> ssh-ed25519 vT7ExA PE9zzE4bKcexXg6LuoQnUOJbvNlqQF//qm1fgB6sM0M -YSzgtZ+zGoTljLHrxeIY7MQV7xmLNDPFEeVrSq37QHA ---- VGV6MkGwLwYmCq73bDzIJaRRTESJ9a1fieP1AJNiAUs -j\_I9dUK F1^ouJo - P"ltֱv%anEZX2שS; J$~jcg\~5$ք* ]" ٠jS+qΗ@w編˚N1F@k$_a…;Z |XLKh0 6"<ّ \ No newline at end of file +-> ssh-ed25519 qM6TYg B17o68OCsoljQLd4yLx1gZbt9zsFhQE8/QJeZ3Gx+AI +ADxN8iqNN5ApzHMtIXMnMTN4qe/7ba+ZoqkpHDpq9dE +-> ssh-ed25519 XzACZQ Jp5WvbUVmfecvN95vM6+DQmJicVf4u94Vm0mYtBVODw +XAdVpk6bAwAU7OQxvedepr3g8HQo5sY5efy3lYhf1xA +-> ssh-ed25519 51bcvA DUkgjLS805iAsnaCl3B8BOP6cdKOJCx0aK23UEDmTyw +dUZhXJiYkCZvassxSg0Cgf9c+ta2Oc2PNhLdvHBP24M +-> ssh-ed25519 vT7ExA 0Z2/GFY2aqO2HJJet3CRSh3yxchGt7AYTzkl0D2aoEQ +GuMqW7tbsEl/SskgN1hPa0B/aWtet/+pHxmbwsTzPCM +--- vgf72fLRkTVRtJoxh+qfim9YYELE0W74L6ZVjpo+8vI +=&C#/nܤ29o[S+ uWʶ4f/hA#Os_RVEVAlT/VtJNU;nGQݣO{x[#PH9P:z +yX`]%>+~)`Vx۰i-F$xH)TMcZ \ No newline at end of file diff --git a/newinfra/nix/secrets/grafana_admin_password.age b/newinfra/nix/secrets/grafana_admin_password.age index 41f0ce1ae827ecfca58f100d6a0da989b520338e..aa33f26a74fb5fdd1fd4659578356bb1359f6056 100644 GIT binary patch delta 246 zcmbQmG>d71PJNJ1c5z^ML{*NqadEO~Zdie@pRcxCguX|1rJq@5NwH-{MtHVKrKM+Z zK9_r5v0GNUTa;05sefo%YLQQhWu8a5dv;!tuW?Y7g+*4NaacuhT4aH*Czr0Su0nE@ zW3f?TKuKUNYCch}xG*uA zEQ|L^Tn%eTvfB3SG~-wQg3pXmA5OCiEzDtM@mQtiUYRJ>y?ccdL(zQih0R6(8aL#1 zxa_<+XKG5XXOvRQR6d1ePmdm)_}za0!<5ST;@{L)EjzM3DgB+z?k(r%|KSAykg;N; delta 246 zcmbQmG>d71PJMc2c2Q1Vm{VD}e?hoUhD)VcYLvEJ5SuvtNxsh3BImvex#vrBepI+w1lu7Y!3 zuuqPGZ@Q_QdvKbCyP==HPj-ZUMP<5gnR9w+rmK;kdw!yic}Tf?NH$kZc~hI5#q-PZ zmnQ1`c1`%QM>ya}k#gNKr=;qP#=rv;53ximO@4EsGM?w(2MPZc_BS)%DEEr(boF}m z$By^d6#hli@;`9KT~*eYH6wKHya_35Cv=3HR?GWKuQr^ZEqK2yb>Dk_|HAVdT>kfa zwnn5a-MjX5wx!nAqnr1;X|``*Fr60vMlO-xo8!k7hNx8U<9Bu|{%&Vg6@6QON_=s! zB>(FF9k)MU*&!RFd9ARN)$7;_z5Nf$Yd^nLDmB@wzn^EtnYDl7>Nn)9+|+c9WB;-D IdKtP_0B?4J8~^|S delta 304 zcmcc2beU;_PJL#PyJ>NxPqBWHL5PoMQhtz=pG$Z^WKn2IP>H3Re!fwDL6&7kV472o zBbQ-OkY!OpS+b{oNlB$?Mr2BMhDTvuhMQSIuD5ovV}7W2WR|vekxN=qB$uwPu0mo} zs#8X#g`;O?RJMgreu!nJkG@HwtD9?3VS%N)S81S6X?=K7k-0~TNj{ft{hOPTmzgT$JefAN|F*H?%0(czf8Ug=QW( zP02A!4lZ4Kjq`L$kX7J(vw21mnGjU&r2t+a7xYm`L1K;?25{-cXPM5CLVgf II;wFw0BDMZ^Z)<= diff --git a/newinfra/nix/secrets/killua_env.age b/newinfra/nix/secrets/killua_env.age index a687f6211fec31f18280e8a9492dac7106b0fab0..54a0777bf7f3d3a03f093ff050d5489d772da076 100644 GIT binary patch delta 257 zcmZ3=w3KOrPJL9FV^Tqsg}!A~azI9EcvP-oXp(lIK~R>TQ)swFa&od+RFY|KaZYAX zB$u(PesHK|MR{?FZ@7n1MS5CMkXcz#Vp3X}enh!>MSfX9g@t~Kp=GX@Czr0Su7YoY zW2t4fX_T*TVTMn#Noii5lY3>FNtUCpMR`F^uwRi&YL#0`a+QCnn=99y?w{B@PJC{Tr$$zN-Q JWA5smzX1~=WlsPA delta 257 zcmZ3=w3KOrPJM7-uxWm3gh5KCzom;$rcp{-v8AzBxtnQTN^VeSqFa=4NMca3v5Q-t zFIS#Rcv*=@Qkhv`S!9uEo=H$@s(w(QNx8duVz{AYW>Hmvdz!mPlyh-pIhU@ku7Y`` zc7>^TqF;DoK(cmrRldH5V|a#kaHx^9ex7SexVc+VL6v8rN4iIlMLO5N`)|XT_lu}p z**E8e@&m4g8`95vR#fE{&3Kw&Cw@x#K~SpnGW+{1yZ1k+Vk(T^`>@X_;E#>f_GP8H z8?4N~ezP^W@l535N#CDKq?pXx9TOfzJ($CKtyJx$`qQlKmv^1I_n|X1CS3J6+d|*J L^A!!>GZ+B?xT|OE diff --git a/newinfra/nix/secrets/loki_env.age b/newinfra/nix/secrets/loki_env.age index 2906c386158e71617a4c450cf6d786b5fe8c9497..f071802002c65d2612df5f110b40c8e4b41314f5 100644 GIT binary patch delta 291 zcmX@cbc|_&PQ95^UWjq2XJx5VR7jy&rDJwfh=I3znMZkOwuyH{NqIr3S3#O@V!20E zHdm^j= zqqS9~hpxE(m?zc$L@gz6`SpLZ`(@JaO!&R2{ocV#annsySFZgSek%Rm%e{q`(|xX8 vVLqr~RLT+ebnV)yG770XC&`{VJY~O#2d2&c#dc99ogk?@xss&f@7P~v?_nEKQ zE!%!`CF^jr@6*Q z|HS6bOxUuy#C#g-Lm~UxEsihmU=sk0yq`Xv8YEN;I&0J@;I}^3m-@orRmYv3AXl#_3k@9dIPQeNVnol=tG%B5?kP+Xj$ zo0?)|YHDby5K-mm92KY#{TNpPpl0;g)Y~9AsXUR+wvM;aZTI?p&JB zrK_u}pr7JYTBaW!QdVphQd($ikYs4!X6dM(=v-QET2|)jQ|go%?h>ILoaOGzrF!}9 zqsp$MOOn%;ekiyvZ66byC4TN^@{huk*SgPGg-xD6^XIXaTjfv6Yn8T@v%dSw@bbFP zy`>dh~^XX}r4e_kHp?hDHG{udFtYBiw2;FKH}4f4wt0ZWXh4 L!t1pMoi&>QhZl^< delta 362 zcmeBW?q!~!Qy*68WE7c^=o{e~8WL6D80w&s?49f3@8q5n=oRVY z$z>XlmXU8_=3QJ?mE)D_m0^&c6I2;d8JV5vY*yxBmTr(9Q4;3tW2l{<&!uapP+Xj$ zo0?)|YHDby5K-mm92KZg78x03QWBKo7MPQhU6z@XS05DRY2=xjY3iAxAC~M?lIdjV zR903RWai??m6eee;vZO^l$ep7S>l|YYHnVblc=Aa?doKy9}*Si8EE7Zo*I%CU>umu zrK_u}V5)EFkzwdpk!zf+9b)d1=4et_8thT%oL^Ls8<0|v8XDx~QcxA?98m7cRg`8e z`#&%4b@KfW1#?}E-4}~VeBZ0K<=?rZS{vj3+}AHyrkQdubNj=kMI2LmovK7<+s^Q4 zf493=$n>k+#~-~j=1lu`OpS9x!|Q03%Y~DRs*XIfV$^z{zy0MY|FDBzY6-7-bE|eM LHCKFCv{VKFa_)+& diff --git a/newinfra/nix/secrets/openolat_db_password.age b/newinfra/nix/secrets/openolat_db_password.age index 3aad0a61e0f577953c0fbf52d5c344a0c9359ebf..a9e307c829228daab18fef85d96b7d3b0ed89753 100644 GIT binary patch delta 286 zcmX@ebdYI+PQ6R1cd}P_L{+X&MwWX{x|2b6kc&k{W{`Q6TSZcifq9x`W|2vzzL9=; zAeVW$f2mJ|L0Xu8UTHzHf4;wGNMxdORDN!`Z+L2=K}K1sX_}*Xa7v-01(&X_u7a~q zVMhg?oCSYe=9$xnW^?kx{vCfuUQep<78&rE6Yrp|P`bvWI83 z1y@O!b5y#8ky$`#v8hiS-54MQ$T=GS$$erPL;o#Q9f5;Ug@K@6K2ny z+2!PJ?0;HSDz;r@{xsXVcYlQYPOmWw6#FDGWzFm_^Cm5NJ#&*iV|cFW>x4;BdmcXw zjgMHjEp}ZvJ3PQ71Rev)B+l~Y(qVN|HMOR=S8V48VmaH2tyQ)F;%hJJFHuW?Y3XL3cj z1y{1KQ(}=@nqfqaX<$-eMMYX#lxcy7hpSP#o11%jVn&3gkFis^n`>p7FPE;au7Xcd zm|HvJ3PQ5{-VTzf1Nr9VtXlO}VPD+l6wzGGkMXEtkcv*6QdtQ)*r@o(=k6}cx zFPDW!xtqUnm1lT{xwf&Feo=;7pmTajrD3+ATV$wlaIj^vn@MVRQh8LGCzr0Su0o=D zg?5;6fv071YPNe)N{(4@T9C1mxvzg{MV_C#f10+hS9WoLk4vF`kqOts$bX@2tzFkw zi2F_YxNe2zyXzJIFHuJ?^KPrB5);sf)|8_kG0A!kD!vFvP diff --git a/newinfra/nix/secrets/registry_s3_key_secret.age b/newinfra/nix/secrets/registry_s3_key_secret.age index 91288e143b0218c35b1af78807cba224585ae8d5..3b6cb41f5a8e30cb56aa45bd50be5a0fa1943647 100644 GIT binary patch delta 329 zcmaFE^oD7IPJL>!No2N9a&d%@V{ueOk-JBFj;DV?UPi8Qa-K_;ms6sTcCevSlyRn; z371i2ZefOjo2PSbeps%)Tc)vVNp^a^NnVh9KtXb_S%7n5d5EuvcagWF374*}u0nEh zM1W&@xU+{>pkK0nRBotKK~X_ikbzH-W0hZIfwyyZMtzoLNrZNkM>$vLmBp_f%sl>&I=k)RlRnP!b4;CzN1mtY zRQvzaQuw>daH^m4D(`v+L)+$4JO(xoVt=;RGWhvaKfa~>p?;zlU$o#o`SYEvYIzsnYH+eky^O& i>f2e$ZhW;1IFH`$+#Ni9#{CP9!f%W=vCkDT<^uqMp@)0` delta 329 zcmaFE^oD7IPQ5{nQHg7*W2C=}Pk5Pecz&XLa(Sq4o=;h+dq`kXiA7q7g?C|usYzIv z30JOmX1YgJR7q~Ae@2FWMzVIYg?@pLhqhT(T3Sk$xuttX4-FNrZ9iL5BbreS4JtjPRLdpBk zkh|+^?GCm!i!M;z%D;l?_~q%h+xN>S*KK!ryz~7*>EBXqQ7$*_l-OopF;#8;{nBuo zIfLsVtsExj_xFC-I^A-05_6cpp*v4`OTg{eOGiEi9KN$)=eoYh;%1k$>i?a-@ZZq5 jc7AP$hmob#+J)?y9U&W4&zWz#%g5f&_;~TQi=TS{gL07D diff --git a/newinfra/nix/secrets/s3_mc_admin_client.age b/newinfra/nix/secrets/s3_mc_admin_client.age index f8b93d839f96a4545c57b059ac625a851f0f71dd..719f1ed829bbc6f788eb8863fda54a97adda9040 100644 GIT binary patch delta 732 zcmZ3)wuo(lPQ9Z`SXN4gsb_{^glVzAUt(~MUvfo(r9o9%O0kzoR(e)uqD7v6W?_Vp z0as9@sh_rMc2#9zm8X+IM2Vw$SYD`~pHZPfVuoR$Sz$y}MRtURaj=_XGMBEMLUD11 zZfc5=si~o*LPV9Lb5x*0S!G$6NoHu3r+%hOPPRcopqqZMr;$;qn`dcpL3vSFj*F#! zxNm?*KypqwSCUDoyS7PWqH}6-esD%nS%G0b0nXu-9`5CViGG%eZf-`-<#_>>MQ)K?UWrke zWl`xV!Pyy+nWj!&2H_>aRc7TOCGH-%>A4|ZPPt*eWjQ`+MyV!~;~B;4jSY%j!wPZ& zoRV`(!aTAw(kd)H%3ab6e4L!Uyn|9o{en#_jV(;eQr!%=D$?B(^-U_nj7)Mp!o5TE zozk+yN{vcAvooXeOI<6xN-9&Fa-4&c%CgG2baizVGF>Z7EXvHXBYnIo{ga9U3QEoL zT=NP`vNE+j-E&K`g3}A@^D0ftoRZv=xgtyXyF=bBSh&l0a^Ugr>|)D5{T8--$mAZr z+3xTzmb8P3$-Y+l*XAb{u>Z*pa7@wPFvG*cQyB6Lyx$+{)zuB!(J-7OS=!s|7_Brw%-d%6*<*T&y z*i$u|i8)83wwN+ZxU@~EtjK?=WQ_NMUzaPzgEslSbYGX^;%xHz#iX7&_q~1}e0JvZ z^4q@;%>NJ^|LWpxpEGL?dqunOESJJ9g&6XMz0?zPN|>E`|W~G=;0Y6c0X*E dT@foc3fjQ?rM2Su<12k{omMq1xM;g#J^+Y!CzAjG delta 732 zcmZ3)wuo(lPJM8yg?UQ4PlcyfxJOl>MR`Vvlc$lsd7^)mwrNC8esNTJR)l+?g|oIt zC|71gP@cKBk!ewCWsr+gif2@4PJz2=s)t98w`Y=%g<*kdWq3%wlW|&QD3`9CLUD11 zZfc5=si~o*LPV9Lb5x*$Z;@+mv38Dsg^`7Jn4xh*rJIqrOQB_0vAMrTcBD^eaAdk` zN~uS-mwQz{mt&woPGDMbS&Czpr<1pHTBfOGvR`JfduBjDaiD8KuB&BUgH z-UZshj)tZMk>NQRey(O!MX8>dDJ~VI0omah#mP{me2dv)z)pJkz|x+=AV5D%}dheBF#g z{XDAzGXts$Gu+cMA`2>m%OXw6JoWR8OPq?ibaizV0xI1+BHew=GCj46jGc?Jll=Vk z0}YZ&OI=F+w4MFEbBsgl3qq38Q!65UxkSa*EBfXpWVq~ndiqD+W3|&KWvV6p_xU`l z^zVq9=Ttb=o;R-b)Ir0t6;1N_Oh35^+oY zb$#JWoqZX$&pbc4_%$jlzsCCGwx@-0MS%Lt)rzx|S8Tg+$w=%f-*a(Ev87_{X(~T| zt8AQiMs{(%LfXpJl9fN^#Lh6et~a-zcTbp{)q1PEd55ALemfj9|GK)W=h4E}o2>IE zTdyf;i9I3ub*7SpcuUpW1M}T-8+~VX>-UvT6#CIWxAW`2kh4a6&%X(pXUlwbt-F}1 b5TnbFzukXq>>jZ0mg1PF`)_^Qq6^&sMiC%G diff --git a/newinfra/nix/secrets/secrets.nix b/newinfra/nix/secrets/secrets.nix index dbc1da9..1d3b484 100644 --- a/newinfra/nix/secrets/secrets.nix +++ b/newinfra/nix/secrets/secrets.nix @@ -23,6 +23,7 @@ in "s3_mc_admin_client.age".publicKeys = [ vps1 vps3 vps4 vps5 ]; "killua_env.age".publicKeys = [ vps1 ]; "forgejo_s3_key_secret.age".publicKeys = [ vps1 ]; + "upload_files_s3_secret.age".publicKeys = [ vps1 ]; "wg_private_dns1.age".publicKeys = [ dns1 ]; "wg_private_dns2.age".publicKeys = [ dns2 ]; "wg_private_vps1.age".publicKeys = [ vps1 ]; diff --git a/newinfra/nix/secrets/upload_files_s3_secret.age b/newinfra/nix/secrets/upload_files_s3_secret.age new file mode 100644 index 0000000000000000000000000000000000000000..a556152e28e6c5564654e09fe83728cd0afb4ab0 GIT binary patch literal 474 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCSH^fe2KOjmHvbP34G z(htt8st5@6D@)1?$?(i_EDxy4FZ6cF4@{}ZaP-v9@lPp_Naixj2{ku1NRJGStnfEB z3$?WHE;NrYH7GF)NvgEWt#HpR%7`e-MHcz9*~&F8$8MRlyIS~@ z^7t_~DOXPUw@ZKXc+UVEz z<w7U7s*?r558=^dHkrtOr$ck(HZL9+_R4Vq{X5lxdWelnr309A5xxcV&P?+ZfR;!%%!WVs}LUM zljT{Gmf=*GQ)X&f8B$efpzmLm780E1Vpv%am{w}(8tU$rW>^*)>dG~z>5R?C>XlM0 zk}+XEWn5C{U$^iTTr<)$>mCel@Jg X@)Mt1|EK?w%$1Nhv*Y6%>Qz}Bk>YI>X%=i$`*(`dA~Uzav)W=d!~8=5t8=a7CWD;%e Vv|%~Vc?&hEGoP&6U4k22RRMYWP(uI! diff --git a/newinfra/nix/secrets/wg_private_dns2.age b/newinfra/nix/secrets/wg_private_dns2.age index 3657409769edafc7affd7efe143086405494bbb6..8495f12187563afaf592de3e1ec7bf61c98fa920 100644 GIT binary patch delta 220 zcmZo*YG9h6Q}2^$=o#W2>X958=;jq+;1}qeSY_#$l$B=YmsJ_&9#ZaV8SYq><>eS^ zz!jRB?H-wFQjzOxVG(NJ6k%$V>Fpk#=M)m|>|RviTj`tXXI7P(Vrb-I!lkRLtKb{z zV(FNf9j;&H=c^rV?4B89WL!{gX&P1Rl2Kd{6_#h}8tPkEWDue463QiVs_E}_j#zt# zrLRIfn7$l{<*$5`M4Yi^#M;cgZY;ue--9u!{U?~-3&>X&9*Sx}^H5S8NU z%jFpCo*osE8y1q`Yv5Fot6!PpS>jusZloQi@8gx^oS|LjTw)NClNDlU!KJIKt56o` z9_k#KmF8TO7H)2kS?rgZsGVbIoLG`sX6_d3>~30I5t@}95FX)?70Gok>23V3j(@%L zGUM96RP4Sv;hU*8<7C4qT?5saU9(^BJuR2?Si{z!=iLO|{>_px>r$UteEwxqI(ajL X(p71BS?(Iuj->O3))#N@o3a1^ ssh-ed25519 qM6TYg vC8XBZQGff/q/SEsiIb+pyhfE/2MCWbo1m+suXpzyhY -r2R02FSzrpiPyoAeiPqWNdXc0Jqd6v2rv4hxo89LqD8 ---- NBCfTZYGNmAHQOABVhlcsgbJmKpmeUM15FdKLQjVazw -,t} | &-^uU6Z_&ue[w _벢 -^\(gPy-j;D \ No newline at end of file +-> ssh-ed25519 qM6TYg 4aRY2+KMkGoSJtRfdkTRwIj6bYGSQJvJjq669297MHE +Kjf7jo93e4oMRKmN5u3Xa3CUpIp9bZPoUAGqjdgOulw +--- wapYiQbpT4gfZyI5cMnB4O+LdM9PvsUxM7nTv954nNg +eVn?]Ł3!l0ر<[o[?B'W( \ No newline at end of file diff --git a/newinfra/nix/secrets/wg_private_vps3.age b/newinfra/nix/secrets/wg_private_vps3.age index ddb65ce..0e7dec1 100644 --- a/newinfra/nix/secrets/wg_private_vps3.age +++ b/newinfra/nix/secrets/wg_private_vps3.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 XzACZQ FnGfRDdT9kQXeYzv7yzwI+1fVXmeseC6YVCCzeoeLCQ -HydL6WRBzLmqAKNmf0kzBmZiFRQ8KM3dHEdx2676Nx0 ---- E7+8BYiNPPm3fI6FiEii2txlbsesfSXuE2Nxvb7Zlx4 -m5q~>R-e~+$T5PrnH:$4jkB$CqRuMmF`A4e \ No newline at end of file +-> ssh-ed25519 XzACZQ J67LUjHa64q/z1K8zZpx1rsnoQ94NzhkeXEpfNr4ZVQ +dy5Tre9IicxhLBHoqvQAZepG7bNg2dEXFT5iPRcWOcA +--- 9dJKhJeue6VNi0Sw05BX/t8jsxXyRIKz0K3/sy0kT7w +h9isM =TnwW)㲛\<2*%_ܳgLN5cD5@ͻ \ No newline at end of file diff --git a/newinfra/nix/secrets/wg_private_vps4.age b/newinfra/nix/secrets/wg_private_vps4.age index 15bf0d4..414c14b 100644 --- a/newinfra/nix/secrets/wg_private_vps4.age +++ b/newinfra/nix/secrets/wg_private_vps4.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 51bcvA IVcXj0PQpO6Rj7ovi4GgoQF77sRDdumHNavSVdQXcHI -O7j/05HqbjLvIYh9cT/iT8p6GMDn14vDOqU3Jh6tUIc ---- wt0viOUTFWu9ze3CcQ4i1xMrb+RLTOg2hcVsDwbzMzA -i-_rˣ*=@|D3e%nȭY'Rh3V%-=W; icS \ No newline at end of file +-> ssh-ed25519 51bcvA P7ouUh98Mfi9Jsu6MDWaWH0NB2alXRIK8hxBIs0Nylg +tUZ1sWLlvPizsSWhK3fnVVhr4C9Ign5rwowxePGXFII +--- PHPizXT8GPP9mIFg1paqqc8w3qsX63XpLkeT0APybik +B?*8-nLsj< k*.@6KUg '8 #h.l~S3%!VYKlR ؘo \ No newline at end of file diff --git a/newinfra/nix/secrets/wg_private_vps5.age b/newinfra/nix/secrets/wg_private_vps5.age index b38a13d..f677cad 100644 --- a/newinfra/nix/secrets/wg_private_vps5.age +++ b/newinfra/nix/secrets/wg_private_vps5.age @@ -1,6 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 vT7ExA kxCR8CbPH5GgSS/ENXQ81zPQ+n041l7yV6zzQv1smwk -mhn18RlBXbpMfZAHrUam5ktlV5Z28UIg8Ufk4H/tfSA ---- WXmrUK2YnQQqZQgoW219LEVgBoHa+N3NqO4cqsF9Pr8 ->0:h`;D + -쎽*TYD 9/9:LwQNCx'QHdcMϣ8 \ No newline at end of file +-> ssh-ed25519 vT7ExA 9+j3VYkFAW1obbLc31nv+45SyPMqH1zZPkI+PU4lVH8 +G9QkkyTNH499EWhjiXCyXt7HgHlzJTZsaLiR+yOF18E +--- vq7bT3yTioJ1UsD7hSu5jyYKhOE6UMIMsosu4f5pK1w +QV#(7EY\Z?G٫_C I gNiVe]tx@w+ \ No newline at end of file diff --git a/newinfra/nix/secrets/widetom_bot_token.age b/newinfra/nix/secrets/widetom_bot_token.age index a1146511bd9f48d7740248c3f225013ae9afab99..105c8e59d00555cd1a7f112c1b2b5341bc084b39 100644 GIT binary patch delta 236 zcmbQhG=XV?PJOXsd1-2av0r*>NrbDnx2c~+lv{vVq=Bc4qkBn+k7tC3VMd0jkAX*J zGM7bxlX+=nNp4VZwwJGWrfINcWU!Biw@-ROq<40iX}M8&qIaT~k7aR)374*}u7X!- zvSXgVuWzZFPl0D;x@C#BV^v8;v1Lg~wpmi8S+IAqZ)&)snR9ufwgFe!@~=%7G(v)A zpPlh!%LK22LoS~VsCv~;*NS_WGj00)joo_>MYig9E`PE^r{2VZ|@GFiUS o{WhD~vF#d9yLt2_rDJr$Ulu)kX3qWcB_ng{=e!2hhnpOF0i$YN00000 delta 236 zcmbQhG=XV?PQ8DKcaWQhf0Cet2Mhp`Vd!u|Y|BR-{L$t7mb9rH`el1(&X_u7XdJ zad}F%fpMU*V^MB#sFz`iSF(4$WwM`so`Hd9R7S9KXlh=if4)hniz}Cz$!0OzeeJA_ zOXEXs{pMBf_~~>e@1w_;j6Ac`GW*JUBKBT?YUR9%aUmar)vx>Kl%AfnWc_*Y%7tys o*EVtQ)(UU<%YIxwtE_ypiJH&#y7uVDR&~Nz9=WqEeXq6w065lL6aWAK diff --git a/newinfra/nix/secrets/widetom_config_toml.age b/newinfra/nix/secrets/widetom_config_toml.age index 27f4f5d138c4d6fb19668d1e49adb15ead04dc3a..13998d281522547281dea22749b31da205b595f5 100644 GIT binary patch delta 4000 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 DC{U@u diff --git a/newinfra/secrets-git-crypt/upload_files_s3_secret b/newinfra/secrets-git-crypt/upload_files_s3_secret new file mode 100644 index 0000000000000000000000000000000000000000..cd16464f4115ca2931bb9c058e6bff1278f707c9 GIT binary patch literal 284 zcmZQ@_Y83kiVO&0kp09c93X0VrM92JrN@NP-Bgx;q2V<#M~8&^h5TEY?UQ6rKhD;U zN>+ZdSAX)i>uiZTBvK|E6yCqvQR1D;<|F?U&%U?Z_A~a(l)@$VCoPDbzi9KR$zk7K zO82gm;^goOls9$Wa$94^b*)7_#Rg8gpBMhLG4a2@?bhx!LhjER!{5Z|weZUvF|sq8 zCG{@d!oAI z&H8suAfc;ejv{}P*L=&a2)`wA8@D#b?-XE|XuH+3P{Jrk<@iOW-8Rf=kJ~fl_S`*j tLSASNXZCNO3-zvFk0;&g-pXstb+t=q{hp|(X(1hdjN`0=3{Mtv0RYK7fp-7^ literal 0 HcmV?d00001