From 68174b4a7774de301d7b226a6adb7349cf99d0aa Mon Sep 17 00:00:00 2001 From: Noratrieb <48135649+Noratrieb@users.noreply.github.com> Date: Sun, 3 Aug 2025 00:33:53 +0200 Subject: [PATCH] yolo --- .github/workflows/apply.yaml | 27 ----- ci/build.sh | 4 +- misc/vps_deploy_key.pub | 1 - newinfra/README.md | 11 -- newinfra/nix/hive.nix | 30 ++++- newinfra/nix/modules/dns/nilstrieb.dev.nix | 5 - newinfra/nix/modules/dns/noratrieb.dev.nix | 6 - newinfra/nix/modules/garage/README.md | 8 +- newinfra/nix/secrets/backup_s3_secret.age | Bin 662 -> 772 bytes newinfra/nix/secrets/caddy_s3_key_secret.age | Bin 661 -> 771 bytes .../nix/secrets/docker_registry_password.age | 8 +- .../nix/secrets/forgejo_s3_key_secret.age | 11 +- newinfra/nix/secrets/garage_secrets.age | 23 ++-- .../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 -> 912 bytes newinfra/nix/secrets/secrets.nix | 10 +- .../nix/secrets/upload_files_s3_secret.age | Bin 474 -> 474 bytes newinfra/nix/secrets/wg_private_dns1.age | 9 +- newinfra/nix/secrets/wg_private_dns2.age | 9 +- newinfra/nix/secrets/wg_private_vps1.age | Bin 257 -> 257 bytes newinfra/nix/secrets/wg_private_vps2.age | 5 + newinfra/nix/secrets/wg_private_vps3.age | 8 +- newinfra/nix/secrets/wg_private_vps4.age | 9 +- newinfra/nix/secrets/wg_private_vps5.age | 8 +- newinfra/nix/secrets/widetom_bot_token.age | 8 +- newinfra/nix/secrets/widetom_config_toml.age | Bin 4006 -> 4006 bytes newinfra/secrets-git-crypt/wg_private_vps2 | Bin 0 -> 67 bytes playbooks/all.yml | 5 - playbooks/basic-setup.yml | 112 ------------------ playbooks/inventory.yml | 4 - playbooks/vps2.yml | 97 --------------- scripts/copy-deploy-key.sh | 23 ---- secrets/cors-school/bot.env | Bin 373 -> 0 bytes secrets/cors-school/db.env | Bin 81 -> 0 bytes secrets/cors-school/server.env | Bin 212 -> 0 bytes secrets/karin-bot/.env | Bin 207 -> 0 bytes secrets/minecraft/.env | Bin 140 -> 0 bytes secrets/vps1.env | Bin 22 -> 0 bytes secrets/vps2.env | Bin 22 -> 0 bytes vps2/Caddyfile | 47 -------- vps2/backup.sh | 76 ------------ vps2/docker-compose.yml | 109 ----------------- 49 files changed, 88 insertions(+), 585 deletions(-) delete mode 100644 .github/workflows/apply.yaml delete mode 100644 misc/vps_deploy_key.pub create mode 100644 newinfra/nix/secrets/wg_private_vps2.age create mode 100644 newinfra/secrets-git-crypt/wg_private_vps2 delete mode 100644 playbooks/all.yml delete mode 100644 playbooks/basic-setup.yml delete mode 100644 playbooks/inventory.yml delete mode 100644 playbooks/vps2.yml delete mode 100755 scripts/copy-deploy-key.sh delete mode 100644 secrets/cors-school/bot.env delete mode 100644 secrets/cors-school/db.env delete mode 100644 secrets/cors-school/server.env delete mode 100644 secrets/karin-bot/.env delete mode 100644 secrets/minecraft/.env delete mode 100644 secrets/vps1.env delete mode 100644 secrets/vps2.env delete mode 100644 vps2/Caddyfile delete mode 100755 vps2/backup.sh delete mode 100644 vps2/docker-compose.yml diff --git a/.github/workflows/apply.yaml b/.github/workflows/apply.yaml deleted file mode 100644 index f18fb9f..0000000 --- a/.github/workflows/apply.yaml +++ /dev/null @@ -1,27 +0,0 @@ -name: Run playbooks - -on: - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - name: Run playbooks - steps: - - uses: actions/checkout@8b5e8b768746b50394015010d25e690bfab9dfbc # v3.6.0 - - name: Unlock secrets - uses: sliteteam/github-action-git-crypt-unlock@8b1fa3ccc81e322c5c45fbab261eee46513fd3f8 # v1.2.0 - env: - GIT_CRYPT_KEY: ${{ secrets.GIT_CRYPT_KEY_BASE64 }} - - name: Run Ansible playbook - uses: dawidd6/action-ansible-playbook@260ab3adce54d53c5db8f1b2eed1380ae5c73fea # v2.6.1 - with: - playbook: all.yml - directory: playbooks - key: ${{ secrets.VPS_DEPLOY_KEY }} - known_hosts: | - vps1.nilstrieb.dev ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjiNfzZQpN2KWd1LSM/LL+dLx8snlCV6jYys+W4NOBH - vps2.nilstrieb.dev ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKzt3OZAOG2sih8T9Bhoqg8ANBP5ZX60z0xmUW4cBWvX - options: | - --inventory inventory.yml - -u root diff --git a/ci/build.sh b/ci/build.sh index 7a40715..e5c7a26 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -7,9 +7,9 @@ APP="$1" if [ "$APP" = "hugo-chat" ]; then REPO="https://github.com/C0RR1T/HugoChat.git" elif [ "$APP" = "cors" ]; then - REPO="https://github.com/nilstrieb-lehre/davinci-cors.git" + REPO="https://github.com/noratrieb-lehre/davinci-cors.git" else - REPO="https://github.com/Nilstrieb/$APP.git" + REPO="https://github.com/Noratrieb/$APP.git" fi echo "Checking out $REPO" diff --git a/misc/vps_deploy_key.pub b/misc/vps_deploy_key.pub deleted file mode 100644 index ce48e01..0000000 --- a/misc/vps_deploy_key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC0Yl4+vAFgN+d82emRY8tHDgM7Pp0rLIsKBZku+YUsd vps-deploy-key diff --git a/newinfra/README.md b/newinfra/README.md index fe67e82..4093fce 100644 --- a/newinfra/README.md +++ b/newinfra/README.md @@ -5,17 +5,6 @@ New infra based on more servers and more shit. All servers have their hostname as their name here and are reachable via `$hostname.infra.noratrieb.dev`. They will have different firewall configurations depending on their roles. -``` - --------- -------- -| dns1 | | dns2 | --------- -------- - --------- -| vps1 | --------- - -``` ## DNS diff --git a/newinfra/nix/hive.nix b/newinfra/nix/hive.nix index 6410db8..6182440 100644 --- a/newinfra/nix/hive.nix +++ b/newinfra/nix/hive.nix @@ -53,7 +53,16 @@ wg = { privateIP = "10.0.0.1"; publicKey = "5tg3w/TiCuCeKIBJCd6lHUeNjGEA76abT1OXnhNVyFQ="; - peers = [ "vps3" "vps4" "vps5" ]; + peers = [ "vps2" "vps3" "vps4" "vps5" ]; + }; + }; + vps2 = { + publicIPv4 = "184.174.32.252"; + publicIPv6 = null; + wg = { + privateIP = "10.0.0.2"; + publicKey = "SficHHJ0ynpZoGah5heBpNKnEVIVrgs72Z5HEKd3jHA="; + peers = [ "vps1" "vps3" "vps4" "vps5" ]; }; }; vps3 = { @@ -62,7 +71,7 @@ wg = { privateIP = "10.0.0.3"; publicKey = "pdUxG1vhmYraKzIIEFxTRAMhGwGztBL/Ly5icJUV3g0="; - peers = [ "vps1" "vps4" "vps5" "dns1" "dns2" ]; + peers = [ "vps1" "vps2" "vps4" "vps5" "dns1" "dns2" ]; }; }; vps4 = { @@ -73,7 +82,7 @@ wg = { privateIP = "10.0.0.4"; publicKey = "+n2XKKaSFdCanEGRd41cvnuwJ0URY0HsnpBl6ZrSBRs="; - peers = [ "vps1" "vps3" "vps5" ]; + peers = [ "vps1" "vps2" "vps3" "vps5" ]; }; }; vps5 = { @@ -82,7 +91,7 @@ wg = { privateIP = "10.0.0.5"; publicKey = "r1cwt63fcOR+FTqMTUpZdK4/MxpalkDYRHXyy7osWUk="; - peers = [ "vps1" "vps3" "vps4" ]; + peers = [ "vps1" "vps2" "vps3" "vps4" ]; }; }; }; @@ -190,6 +199,19 @@ deployment.tags = [ "caddy" "eu" "apps" "website" ]; system.stateVersion = "23.11"; }; + # VPS2 exists + vps2 = { name, nodes, modulesPath, config, lib, ... }: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ./modules/contabo + ./modules/wg-mesh + ./modules/caddy + ./modules/garage + ]; + + deployment.tags = [ "caddy" "eu" "apps" ]; + system.stateVersion = "23.11"; + }; # VPS3 is the primary monitoring/metrics server. vps3 = { name, nodes, modulesPath, config, ... }: { imports = [ diff --git a/newinfra/nix/modules/dns/nilstrieb.dev.nix b/newinfra/nix/modules/dns/nilstrieb.dev.nix index f804411..1d0fb7d 100644 --- a/newinfra/nix/modules/dns/nilstrieb.dev.nix +++ b/newinfra/nix/modules/dns/nilstrieb.dev.nix @@ -37,11 +37,6 @@ let ns1 = dns1; ns2 = dns2; - # apps - cors-school = vps2 // { - subdomains.api = vps2; - }; - localhost.A = [ (a "127.0.0.1") ]; # --- retired: diff --git a/newinfra/nix/modules/dns/noratrieb.dev.nix b/newinfra/nix/modules/dns/noratrieb.dev.nix index 9a4da25..dc52c14 100644 --- a/newinfra/nix/modules/dns/noratrieb.dev.nix +++ b/newinfra/nix/modules/dns/noratrieb.dev.nix @@ -9,9 +9,6 @@ let lib.optionalAttrs (publicIPv4 != null) { A = [ (a publicIPv4) ]; } // lib.optionalAttrs (publicIPv6 != null) { AAAA = [ (aaaa publicIPv6) ]; }) networkingConfig; - vps2 = { - A = [ "184.174.32.252" ]; - }; combine = hosts: { A = lib.lists.flatten (map (host: if builtins.hasAttr "A" host then host.A else [ ]) hosts); @@ -63,9 +60,6 @@ let }; }; - # --- legacy crap - old-docker = vps2; - # --- apps bisect-rustc = vps1; docker = vps1; diff --git a/newinfra/nix/modules/garage/README.md b/newinfra/nix/modules/garage/README.md index c16f1d1..75b1116 100644 --- a/newinfra/nix/modules/garage/README.md +++ b/newinfra/nix/modules/garage/README.md @@ -6,13 +6,6 @@ - co-du -> Contabo Düsseldorf - he-nu -> Hetzner Nürnberg -| name | disk space | identifier | zone | -| ---- | ---------- | ---------- | ----- | -| vps3 | 70GB | cabe | co-du | -| vps3 | 100GB | 020bd | co-ka | -| vps4 | 30GB | 41e40 | he-nu | -| vps5 | 100GB | 848d8 | co-du | - ## buckets - `caddy-store`: Store for Caddy webservers @@ -35,6 +28,7 @@ - `loki`: `GK84ffae2a0728abff0f96667b` - `backups`: `GK8cb8454a6f650326562bff2f` - `forgejo`: `GKc8bfd905eb7f85980ffe84c9` +- `upload-files`: `GK607464882f6e29fb31e0f553` - `admin`: `GKaead6cf5340e54a4a19d9490` - RW permissions on ~every bucket diff --git a/newinfra/nix/secrets/backup_s3_secret.age b/newinfra/nix/secrets/backup_s3_secret.age index 6e4b2ae89ab89eeaad8b566ead2f499e31be941e..4ef136108486d4a9699145de668ab6ed6f918524 100644 GIT binary patch delta 702 zcmbQn+QK$Lr@lDbQrq0Uyx1}-Ti-Cv+`~WB(b>Q>+1at8G{U9CH_F^StJEUX(NNzg zohv6u+px%|B-A?~GCkMF*r~G0$jCc4x5~xU**qgKJtH?FFS*d5u*^R!olDnFp}06h zH#Nn`)YQ;Yp&-CAIVD}eDX_r9uQavP)GZ?*$~Vy@tKPyZB*!E@rz*0lvMfKnGBi8e zzbr93EXmlHtJK%aDLvC7Jj0~K&mz>n&?6}`)6B!qE7#rIH^Rp&tTHv<$gjl7xvazl z-MWY>N9U+Oh4gU0l$`Rapa6aM5R<52ud-YZBmKba2uI6IucYAA9Q{($h%Do>Ec2?+ za<1}{kSIqlBNNA<3fF>i*Srt|qvY(+Kuh;@C%+OyGdBZ|VoNt?i`;U@;)x%{!$T^K zf|E?L6Aj%%^V19ql1eJgQ;e(fN_oD&$s{mu8n3S@@QEWrkKpr6=aN<^}|~=B5?; zmH3$!nYtG1*XQN>6=Wy-q;uuVuZzq!lRLUuQpV{|hPR*Gj>@GQ{N&sfBD*xbPE;lT z^xKjn=%L}e+eKhus>r(%gT*Hw*GzI)?LTR%#baX){*)Q|tc>zMFRflF(p0r|>jvj} zAM{EexOM*O$}oBQV{6<)!BfIZqs@)wi{!qoi$0Nb|M*|_rMr~u|0=)v*F5i|_5B@h cWm=reUbR26xF_>m*q>p^np1z@sVDXU0Dd?9q5uE@ delta 572 zcmZo+o5ngpCp^d1BE{4qDK#J@B`G_~-^0MN$}ii|sWKxxG0!nHJ;K1lFsLZp-MBa> zk}Ei*w9qWv(NSO9(ZDOYz%3~-BBv^}AgC}i&^6C1G^@(O$ICq|Aj>D$apFhuaKDNW z(siqN85H`AQF!cf^NdBORX5rJWWTw&h%ML`uorsXc#d5+oU7Jk9WL0S3X ziJnfzk=m)Ih85aAKIWZn-qAOCwf$R`&N2omV_HQRwkFH zcx3w*hq_sMSLK=(re#K?b9uWuI+~Q_1Xg4hhlF_tYo{i;X;-Eg1o;|Pxw<8$6 zhZmQ+>)a_Q>oDkK#~S(FF3R3!x^xo5ijgogQ)IHm{WC0PUq`&9-;n3?%T)<>FE z6}tKOgmO)&Xm+)I`plobAndMm#djMQ1`j6BuLde1e=f2q-T1x8P3dvele>$K?7G^s z{+ZEwHhj~v?CaJtO}Ec53H&^2cF=CcE2(=tOLjcVHk@i>bnmC?kwD4d z2MKG>2{!V7?CD{3eOvu?f}-QUre?dyj20&)ng3T}14Yl52=EF$xwYNy`2Tx*bE9wm Q>Ch@{RPp+dZZy#Y0NE7T`2YX_ diff --git a/newinfra/nix/secrets/caddy_s3_key_secret.age b/newinfra/nix/secrets/caddy_s3_key_secret.age index a0e5c46344bd48311e3630ba6702541cdd45e596..39bb56043658c765ae2c9759e049e325cd4d7058 100644 GIT binary patch delta 701 zcmbQr+RQdVr#{8UC#NdZG~KTvu)s5*w8A;WKT1EyE8McIFxWA(vM|gwH_{{^Qrp$T zm&-WQ#Lqb^DKO9^%|P4VBPbxR#JnOo$*rtBHzd+OEWFIuF*r0i(!0_$luOr6p}06h zH#Nn`)YQ;Yp&-CAIVD{oDJ#G|$S2${+cDe7Ej-^*yS~CL(cR56r6RyBEF;p`+0!7P zAUiY4GsUf(D?HmICCl6-!@Sraz$n!$Oy4ie(N9U+Og-Yivk8*c!lOzkTuo4q9v!e2Hw=DC>BJ)HG$D)#4@1jss?evT?=b$o| zVy?m{{fvktGxxH9JY&n!RO9rLz!HP}h)kynqriYfvwZh}s&vD!G}Ex0{D~jM!*e|g zeG-%N)BP$VJu`g#vON+_T*}J}-Low6^~1_7!XktHv)oOcvn?u2xGDn*^D2BjoHE>; zLrN<$E0fHO@-xHqOQIrDL&LQFqf8_7D?-aM1GN1DC&x32*ZVpJMwnRm`b1<_=ob}w zC;3>Gy1QkRy1MB{c%+r4MmkqS5^~=5yM(d~aOuF1m%GO>q6x6E;pO{yg+?_p>{&CDWCsVnOfjCmu#xLeA`( zdE9?vg-)mbb5hUazb5=7yzt>&zyCcNtWWflbuEHK#lm(~%~8yhTzw&Bb7S?&)bCox Z)mdxB8>6;=z97A+d3!K#x%UFUl>nF$_aOiP delta 571 zcmZo>o60&tCp;uA*(9(c%Q7b<*`*}4($l{n%Ol9FB*(+I!nDvdqco>5BPzAi}`M%s4C6b>c_y@DgM9 zLg&oza?7Mr*P<|sj0(qKH%Dh9AGh#;B5hxf#0aC%MBjp(qQDAYt}2rp6Cd*kH}9<6 za-)Ef3`@T-%R=MQa?`||Fw>MWe;@xGOMP#5<7`ut$?=Th;UQ6er4?=wsiwjD+L4Kt zj+I5B?zyQ&L1vzbd4-OJ-sVp3dB)oMzJ+<^TsiKRQT~<%ZhqQ{IUyGMN%oDnw+NdnZO21?pQQC+B7O<#|Rr7CMI~8vA-=WJacY1coLR)Mr-Z zRQiP#By*k8IA^o=ZowG_ZhQV{XT`r~ukf-u&EIZv?5xW&W}7=gyWb~g-@NB3J=b|# z)y!E^K7S@p+#=p!=~Qd8WYaFEjY^qK(WlN%jkPIv+Ev}Vv#vmjGv~ ssh-ed25519 qM6TYg QziuzHQxmWyRdv8dUPBWTgnMxFtqR6ttP16Z3XdvD3Y -Krxmha5J+gTU0DjzPDTDIwz1mW0Q84XR2FgQyPm4bf4 ---- t4Mea1Y35o5t2dhREnp8Zq1AyR4DAWMFW7Vv3CkgGKw -lTS+Ƴ6yrOn&c`ϰ :7V-tfpuwIw \ No newline at end of file +-> ssh-ed25519 qM6TYg UtoSFhZQ2PW1y3ifXgSdQQswoi5kdRg2gvczlEateC4 +ir2FpFkYo17MGBy+C4thM4lit7vn2CiBi09DcTb6ubs +--- YvRhsfFzedjeKssmOTzHvKkvIG0zXVVCIJsRNc/LTVg +:ˠK$Prm;۷ + qE@v]m=͙'Sm \ 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 6bfaa64..2c66a3a 100644 --- a/newinfra/nix/secrets/forgejo_s3_key_secret.age +++ b/newinfra/nix/secrets/forgejo_s3_key_secret.age @@ -1,6 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg ecu0Ic6o+WyT7XhZPo0Yf46bOye2LAgnJ5MxFPTY/E0 -JqJCtQmtxgktMl/4HsHh0uRp/rzEoqT9Z81H9v1RXio ---- /CmBzuDf0AcCk6rAvEh5SmIMxpwCTjfj9IQtRLv5qYA -}=5i -#4bpzCajnBN%nOGKϔ'Z>TًM<}//}|u5s* \ No newline at end of file +-> ssh-ed25519 qM6TYg GNYf0FjEDEqCe09mS9Hl7OIIjvhKTu8urwUPtY+yyB0 +xmAtm4n3s0rfq3S5OKFEG2k/noXFTKMt8hiW5QrD9SU +--- HGBYxXQGM254m2YP5twgjgDme80f0uOL2m4uKy19ZBs +( +T +{F-\6{mtM-X{%bQd]E]i}F2$7#k4;8ZG_o \ No newline at end of file diff --git a/newinfra/nix/secrets/garage_secrets.age b/newinfra/nix/secrets/garage_secrets.age index 57eb61b..af23541 100644 --- a/newinfra/nix/secrets/garage_secrets.age +++ b/newinfra/nix/secrets/garage_secrets.age @@ -1,12 +1,13 @@ age-encryption.org/v1 --> 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 +-> ssh-ed25519 qM6TYg F9aj1EmsmRSXt1m3a41zpuwFmDBOuuaIrHkqP7PTVno +tVs8Oxa9gV/HdUf0hN/JLuWhbrXI9BXIrsh5HnsKBQI +-> ssh-ed25519 pP9cdg dQdPm3OfbWl5Y8kJxmsUZ4rwpUo8w3+P3CHCiXw9VCw +9yWbGgzgBz9GICAgYiOyPtMjDk/tBb4vsOveTuYP9bw +-> ssh-ed25519 XzACZQ 4lldtotM16DN/75dRX3QEmOzfIEySHcNOlFWqymI+Rs +oOaD7dZu0xC0R7CrVpfwoBU7eSgaWyJmAZ4WptCQdes +-> ssh-ed25519 51bcvA k9eq2Tc3A9MztsdTvt3sDYUj/usYBJMp9IJQZAR67Ac +ezccfIhPZaHKsVcUrxJL7u3jSA/kCTqLmWuQfxrFQBo +-> ssh-ed25519 vT7ExA BOCylq1RqaburnXxfsl3xqAmGSJnIxVhXK8H2xeFynk +OWhqsbJgHWlo3hsRZVQgEaArK32OI25N4Poi2qJ9wQs +--- bBQkNfDI0onJOyxOJIN3Yl2jkK5iRgYbK67RWsipXOE +3A9AnۯtyCj-{Ň)6DfOQ}'_n>UPNDR-"?>)E0v(~7 eCO\UJJ$S8`FQ0u3mH~PLqf~in]=rSre#wG @|X# \ 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 aa33f26a74fb5fdd1fd4659578356bb1359f6056..2d2fac773111dd94484fe9f6291a1d9b437695da 100644 GIT binary patch delta 246 zcmbQmG>d71PJOy@VNRZ>Q+`lNPDYtyhD(ZJzK^qcaZ0#jqzB0V*8zJr$K*MgcN^MU9$Mwq+Ni|NINaGY)xdR0?n7JsP&3`Ey#OJTTi5^q 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; diff --git a/newinfra/nix/secrets/hugochat_db_password.age b/newinfra/nix/secrets/hugochat_db_password.age index 1c4ea9543615e7d25d11a2fb25f979adc786766e..3e48ca0a11e4e05788667ed74dfbd1a9842aa19d 100644 GIT binary patch delta 304 zcmcc2beU;_PJNW8lSgT#pQmxTXS$(#qFYINl&^MaQlzV|QDuIjuR(H>yLLcorgm~h zB$rcxNky7xm3cr_uA8Hai*~t1T3(d7v3I#+epZN)QMjW^X{e)dc3`qaAeXMLu7XEd zR;fpUud{hXSyra6ex*TGx_@Q5frUYUzp+zNd0ue1UwwK~RIq1gcrw>n3B?xY9j5c7 z_RJQD{3je~mz>|DZ5lK2_3_8Iww@KuayKk?<31N~M(*zR4VUjrcWFr)U)#KSj*iaX z)uH<|;^eFk|42%2NKL<7a=~ia<`s9>B|Q9{$S53dC#jVB(>B9-VdHI%(}&|1IPAQ3 z`POEsi7~;>`90B^i_e%;sJ%M!U(~W8azW3t2}jR!I=o$byII{kMLF>aPlxQzxN9Zi I8;-OB0QM7oAOHXW delta 304 zcmcc2beU;_PJK~DVxUKMkx8CUkf~R&t3`y9M~S~nQC?YDPK2yb>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 diff --git a/newinfra/nix/secrets/killua_env.age b/newinfra/nix/secrets/killua_env.age index 54a0777bf7f3d3a03f093ff050d5489d772da076..d9e3d98d9999924b5aa2d2c75f8d1af7c615368a 100644 GIT binary patch delta 257 zcmZ3=w3KOrPJO0jxOa$4UUpEy*1S*clMzWp=niBz6L>e6K%g{@|=CE7%G$b@9j5RPgRGT zM_LQIzOQNeC2^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 diff --git a/newinfra/nix/secrets/loki_env.age b/newinfra/nix/secrets/loki_env.age index f071802002c65d2612df5f110b40c8e4b41314f5..010ee2828561c27bb424b59146df646de731f950 100644 GIT binary patch delta 291 zcmX@cbc|_&PQ6J{qG5@@cX~-qVX1qbgKc|~xUagtlE zCzn}bK%l>IaI&^`j*(wMZf;OUK)y*(a*B^}QgM(^a#Ep(n@Li5T4bSDI+w1lu0oQz zv88`*Noq)tew4A7u}4&4a&Dn_WSMVia;0BzQb=M_VSRoqA zHR#B;#~vup+P1jo>OC8itnRMj_YVALno`3p<+FC|D;KX>7HM?btGfBB!0H8)cdre3 zY24EMz45i*l!vl>J%8EE=4oEy6jV{OF1T3o#o1Er6aVE(mG55jH#kl|m)z#L_vJ%* t_m>$~Cm8)V9zP{B*W*W6o{Z{=8MQ^m9y{9CEl*^zxNyL7+Dg#^Qvg{hb@KoK 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~MvmY8Dxp>*VZVUf^GnW9XKa<6TkinCVgC8yOO4;2-Xr&82InP+Xj$ zo0?)|YHDby5K-mm92KZwTR#s$~8J1<_n{47{u3wquUXhudo8p+1pB7T;?_1_+5m-`L6;fov zrK_u}VD6Qe?Qh^+T3Vc)Sz2K3qMaNWVD9f7Sdx=so?%{`m=o$7l<)7JXkih^wdGIt zc2jrRmYv3AXl#_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^< diff --git a/newinfra/nix/secrets/openolat_db_password.age b/newinfra/nix/secrets/openolat_db_password.age index a9e307c829228daab18fef85d96b7d3b0ed89753..f202cc0df878f8211869d1b7dbf387986f6b30d0 100644 GIT binary patch delta 286 zcmX@ebdYI+PQ5`+cye$`a8YKmlV7Ptra``Mo?og#x_@!LOHrhyOIko#uCr&bnQ?wb zGFMupfv7s|DB9&wL%8Gyhel zsszsXUNiUIq4S3(WT*!k1}@!h_|p07)lc^tas#by1nTYodoFm7^t*YkD{PZvJ3PQ6Q^VSb6JV^*0#eo}F`k6UtzwohnUK#GNOQ1QF>N+ zD3_mEh<<=;WTA7Ur@vW5YL0oRd$L7XL0M3UnU9mcQ;MZmSgE5?MpCe6K9{bpu7X=q za*C6ydxc|CW?GT4x08RdU%7X{MRsPelY3-ZMKM?Fwfj#a?=>() zW>|Y!+IH-J?{Z>>>a=-#kMy{HIMi~xY>}Z!vX%d|1uLF@x7prtQRI@?K|6Q*vJ3PQ71Rev)B+l~Y(qVN|HMOR=S8V48VmaH2tyQ)F;%hJJFHuW?Y3XL3cj z1y{1KQ(}=@nqfqaX<$-eMMYX#lxcy7hpSP#o11%jVn&3gkFis^n`>p7FPE;au7Xcd zm|HMMYg+sYDI~UXJ~G?Pq2PyWMD`|wrQn{ zBUg5AYNn@0uCr5Rae7j+b6HAAnonV|MY4xwU|48srlm`9YJp#7innQSIhU@ku0pX} zR6uT6WLk*7x2vC9RCt=Dn^#bkp?ijVcyLK_U`mdse!YIGi9umdK_C}%wt2zhD>)nY zecl!K?Cib5d?neor!!K1bNmx{d*!Rzmfaj17~~u4Km9)ab?VdZI5}g3xm)rsAM2NP zYYtv5zdv|W_4knUUzdKQACBXXX+=gw@dP^oNwYb|YN{p^IISc@dz>j1A 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` diff --git a/newinfra/nix/secrets/s3_mc_admin_client.age b/newinfra/nix/secrets/s3_mc_admin_client.age index 719f1ed829bbc6f788eb8863fda54a97adda9040..2cc88626492607bfcc510256ff7986934c731a77 100644 GIT binary patch delta 843 zcmZ3)Hi3PDPQ7z(fJ;zv zCs$!+VoIQiS5lQE5Qud7KxIhU@TLUD11 zZfc5=si~o*LP3CKa!R^_XMlToMsBKhMt*r_L~6OIV||fZsF{C>wz+Xux__0sM`3oQ zPflf~uTz8tSEYw}flG#Gez2owiK{_SK!91Hr-^x1pnpWAMWvZ>R$!=Cx{rmEMP8N# zx^)p%j?Phm3f|@!{t-cG<&G(7-tNBHIT4N}jus*1rkQ4yRlb4A0bW6-o}SrBJ_at8 z#atFSF5VetP6Z}mM#Y6`S(*MW8TlSr=BbgEP8sF-!R2noRVf}}MUFxG+voOmr zFv~Y6(asFYN;h&f_AAXX4E75%iOMq02rf0w=L)Y(%uh2kE)NO}3ePAD4>dO`Ff%YI zsqhTQ3pRJl3v|u%v-C}l(swHN^y z%+n4nH7hnLt}k{^ElA9cFyVTb8D=6cm9Jd;&vS>Acdp-ok_Bv4m#jC;X}tW6E5|-l zr~G`x#jWcXiS3RoxEL64Rk2~FlkuZjGxjbH3KlT>5jej)_=ASr#?OCGRvt{_J3Z~h z!mfI)jNOXndMEbSO*`%!>)o{VDy)uZ~BOP5O2dYI*iO60x4Noa3wI+LIRH1=sx4o4EacZ?rBFa%Xqj UH@{zOvHxx1H@8(U&N?v_0D{CotN;K2 delta 713 zcmbQhzKCstPPn5>SXN4gsb_{^glVzAUt(~MUvfo(r9o9%O0kzoR(e)uqD7v6W?_Vp z0as9@sh_rMc2#9zm8X+IM2Vw$SYD`~pHZPfVuoR$Sz$y}MRtURaj=_X^2Cqg;boO& zVJ4ZORi65pE;-o-1%dj(o<>HcZl0yZ1?5FyIWCs^;l2SL0m(V#TuCOS?%F1iiO#9T z`N0`QWd(+bDWPR10pUeCd5LC*m4W8k7Fof?AyH=(*vBtD?QxH0~7r$6W!d5oXhh9DvR7Axx5miGRvaUQ-ZTIA~Q{$ybQuif~(BR zLrUB|a?^7|yqt2we9Llt(u`6~CZA;#uQxU*b`2}Y32;izEeZ3;&Pc1U^eA^pFYs}4 z_VNx&DfJ6Bu{5?YElYJX;HpS>Pt-T53^Ovx^$7P4(RWJA4l6Y(^~}zU$}e@T@G7ZH zamsNHPAbbP=hD^HRmgO$FtI2z%Z~K%s`O7P3MeQw%X7^uEXm5$_H@rJ%?eI0tk0`7 zEptk8Pv(j&=?zq5-i|MXkf@*$IZ_-4DqyI9f=CMNq@>0g_lSit@# zJHRnTf5QwD`v*s>&M-+kP7-5&d%QG?p^|q`%HdCK55GP=F=^F2QAg<`t@Z~vd2>tt zs_$BO+vLiNDF0@+M)ln42cjpQUEAl#dw6%fxtFif)?-iAY$oO$joM<$FyYcRp|T?X zsgg0?3w~X$6c5_u_tJe`ii@+!>lc%H=G^!Ceel_t&&zNBJ~017aQv%_w|&m6IqVhf z!n1VVenZK|yCP3GW~|=Qa%^Xl`HJ0t7ew>#ZnvKzgApg5&|F7LMsI-!SWh}iwGS$0LN+$d-R@0Zq!=Z~-Sy>(jE KwBVxciunLhHX_3S diff --git a/newinfra/nix/secrets/secrets.nix b/newinfra/nix/secrets/secrets.nix index 1d3b484..456c560 100644 --- a/newinfra/nix/secrets/secrets.nix +++ b/newinfra/nix/secrets/secrets.nix @@ -2,6 +2,7 @@ let dns1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBKoyDczFntyQyWj47Z8JeewKcCobksd415WM1W56eS"; dns2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINZ1yLdDhI2Vou/9qrPIUP8RU8Sg0WxLI2njtP5hkdL7"; vps1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII4Xj3TsDPStoHquTfOlyxShbA/kgMfQskKN8jpfiY4R"; + vps2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKzt3OZAOG2sih8T9Bhoqg8ANBP5ZX60z0xmUW4cBWvX"; vps3 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHvupo7d9YMZw56qhjB+tZPijxiG1dKChLpkOWZN0Y7C"; vps4 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMpoLgBTWj1BcNxXVdM26jDBZl+BCtUTj20Wv4sZdCHz"; vps5 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBWbIznvWQSqRF1E9Gv9y7JXMy3LZxMAWj6K0Nq91kyZ"; @@ -13,20 +14,21 @@ in "hugochat_db_password.age".publicKeys = [ vps1 ]; "openolat_db_password.age".publicKeys = [ vps1 ]; "minio_env_file.age".publicKeys = [ vps1 vps3 ]; - "garage_secrets.age".publicKeys = [ vps1 vps3 vps4 vps5 ]; - "caddy_s3_key_secret.age".publicKeys = [ vps1 vps3 vps4 vps5 ]; + "garage_secrets.age".publicKeys = [ vps1 vps2 vps3 vps4 vps5 ]; + "caddy_s3_key_secret.age".publicKeys = [ vps1 vps2 vps3 vps4 vps5 ]; "registry_htpasswd.age".publicKeys = [ vps1 ]; "registry_s3_key_secret.age".publicKeys = [ vps1 ]; "grafana_admin_password.age".publicKeys = [ vps3 ]; "loki_env.age".publicKeys = [ vps3 ]; - "backup_s3_secret.age".publicKeys = [ vps1 vps3 vps4 vps5 ]; - "s3_mc_admin_client.age".publicKeys = [ vps1 vps3 vps4 vps5 ]; + "backup_s3_secret.age".publicKeys = [ vps1 vps2 vps3 vps4 vps5 ]; + "s3_mc_admin_client.age".publicKeys = [ vps1 vps2 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 ]; + "wg_private_vps2.age".publicKeys = [ vps2 ]; "wg_private_vps3.age".publicKeys = [ vps3 ]; "wg_private_vps4.age".publicKeys = [ vps4 ]; "wg_private_vps5.age".publicKeys = [ vps5 ]; diff --git a/newinfra/nix/secrets/upload_files_s3_secret.age b/newinfra/nix/secrets/upload_files_s3_secret.age index a556152e28e6c5564654e09fe83728cd0afb4ab0..01042a4a3e7d24a71a46b013a924e5a8c8e7fda3 100644 GIT binary patch delta 440 zcmcb`e2aO4PJKwBMPX%TwySfHcSb;lZ<4p0ONw@6l&5=kg=J}$ahZR3ws~NXhii78 z1y{LCQns(TcT~8$i<@z-tFvpOp>IGyh_k7id1*zeMV@u0lpZ zkZ*WdYE)u?qi3**iC2+XQINZbuYX`#P^NjFTY;ZJUVVi}s99Qoe;`+h$)1E`pEg_R z1nidnd8&7-UyJ?3Bb#H^oY?qs_SXGtOC3GpkFeVZq@Pn>p}@(!IYfK?tDu9ruTSiX zIHsc*nHuG`fF*Z#%CtoXnkMi1u{6fyY?6y(_I00m*-H$As!rYcI>W3Yzg|}3kj0Vo zs<5-##WkCo7O?Bp9}cme;J6_Wy+mr8yMTQ_sz{JNGetCr`o-1b}D z6>-6nw=jFt=@N-6%Ab#TP2;QFRTTW8^pyR{cekeb@m%dl`l0AuTzRK{!Fe48$I7(u zBNq=aDYGgoolaOZ^I0Byz_|z=l`6vzecT$X0VmG#_HrLlsucd+Fu}0qMDd5-5b^nk u{#HD7ax2MEG`rm?vE`sHKH>p?QR8xK!Ip3qHy znWgP7<}TG1HPKAaU9P6{-e^G@gDoQ;v7l9#`?jkr3oAWTHFfDF@xG7+E diff --git a/newinfra/nix/secrets/wg_private_dns1.age b/newinfra/nix/secrets/wg_private_dns1.age index 0f4a0d0..e9a0be3 100644 --- a/newinfra/nix/secrets/wg_private_dns1.age +++ b/newinfra/nix/secrets/wg_private_dns1.age @@ -1,6 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 LZU5Eg dlH/b9FXAowA5m9KYdF+MirRu9fKXhf76jHXuKA6OAI -ADHjmdwYkyd24vbi2jbeI9GmFZuf86/Twm48J3g958s ---- WVLjItfhBqlv55yTzq0/OzfTSfD1ypQfu9EGFf1vUUE -<{\VLv -+v_#PIF%(ㄠ>ȟC'n 1|jNT^6o \ No newline at end of file +-> ssh-ed25519 LZU5Eg C3IfbvL4t0pOHEb3Bc54+r6DZESgN6K6zPDhBlDumXk +UwOtrqp8I90Vux6L7CsV5K+2SDFB8LBiyLO8ud7IsQU +--- 2tIecoG70broXFTtgjCUMcvk2RdKqpe5tihO6meI8DY +Akڳ& `!M_v`-Ep^U#:]їDmy^O+t8.͚; \ No newline at end of file diff --git a/newinfra/nix/secrets/wg_private_dns2.age b/newinfra/nix/secrets/wg_private_dns2.age index 8495f12..d986ea6 100644 --- a/newinfra/nix/secrets/wg_private_dns2.age +++ b/newinfra/nix/secrets/wg_private_dns2.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 5bWSnQ Li1ITKUHcUQFJX0NQCaz9Abjf6NjyVGTwE9WAzjJAU0 -UekGYi4xmM88U0BX52iKGWnBTWCGrxMyMeN6zed12D4 ---- MUD9AikW/zNM+W3GiR23pw95ZsDhsxZVn5EMqr0X+DU -ʂ]?@TH]~?7q"W+`+L]aSx*]6Љf \ No newline at end of file +-> ssh-ed25519 5bWSnQ wqkRMdob+7G2mTNKySF2kiGhOKt4GLN/ne+4lM3pIwA +Iz2Brik6I6YHjVxQcoDL0UTJOWcjuiErf5kCeWpnaV0 +--- 1ZkP0GiP78eGKl8te1w+o5I5kEbyPaiJFq7WGH4k1LE +61zITU/5'|h>zr^ɋwanoglX,kܶG +cP!Rh׻fWh䠧 \ No newline at end of file diff --git a/newinfra/nix/secrets/wg_private_vps1.age b/newinfra/nix/secrets/wg_private_vps1.age index c4e3f87452f570738a202f154e18c540ee6cae8d..089fc55446b71ae8c46c6793868734b15d5f29b9 100644 GIT binary patch delta 221 zcmZouVa|kr7ako1JIrUXtePo9>Za=Yf~E=2jTx7NMONR2CK*nOBh;*Q@ Xh41kl5(^F9B_ZaQoEdrLbg}^e{83Qe delta 221 zcmZo)P)WtJ4_9vtXZ=9N`wW@c$*Y3}Rc z%H^GvW}cOAX`E`3?;GTu>t|YO9Fb`399rO6V3`yZkRR&kUYM1V?q8Zy&ZVoXt5BX; z5Sba6R1jj4o)%Trr|BB)QvuTKS@i$_ diff --git a/newinfra/nix/secrets/wg_private_vps2.age b/newinfra/nix/secrets/wg_private_vps2.age new file mode 100644 index 0000000..a92b028 --- /dev/null +++ b/newinfra/nix/secrets/wg_private_vps2.age @@ -0,0 +1,5 @@ +age-encryption.org/v1 +-> ssh-ed25519 pP9cdg GI2CXAYTJWUqmab/Fnl/cFZVCCBxYZX/snQ+w0aPjSk +8D6TxN4VYH14GQJ/XhUqyfKNLjM8f3LDmykLAvtl+IM +--- 6ru8v60LKlJjpy2PnmcwBdV09KMEh+neITYyuFscSIQ +F Йy#<ﯗ֋mߘQ2^T2L9]LĞh[br!jEnS?jCR%s;m\R \ 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 0e7dec1..2536ac0 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 J67LUjHa64q/z1K8zZpx1rsnoQ94NzhkeXEpfNr4ZVQ -dy5Tre9IicxhLBHoqvQAZepG7bNg2dEXFT5iPRcWOcA ---- 9dJKhJeue6VNi0Sw05BX/t8jsxXyRIKz0K3/sy0kT7w -h9isM =TnwW)㲛\<2*%_ܳgLN5cD5@ͻ \ No newline at end of file +-> ssh-ed25519 XzACZQ pOD3jNWIufLkEVtkFJu6W0QjdzPJTK+t1MwgACv1zXU +EJQ+9xPw6MnB6nJW6nDBUlzfHyY9XlfBIQlgje+FVE4 +--- BmTwJED+mJ/Qr0WFDELozwR2BgGDkHDcR2I9eSxuVn8 +K~alNh. kiAF*/MYZdpA+-٬Aܢ*SZ NFfb3try \ 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 414c14b..ca2ab16 100644 --- a/newinfra/nix/secrets/wg_private_vps4.age +++ b/newinfra/nix/secrets/wg_private_vps4.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 51bcvA P7ouUh98Mfi9Jsu6MDWaWH0NB2alXRIK8hxBIs0Nylg -tUZ1sWLlvPizsSWhK3fnVVhr4C9Ign5rwowxePGXFII ---- PHPizXT8GPP9mIFg1paqqc8w3qsX63XpLkeT0APybik -B?*8-nLsj< k*.@6KUg '8 #h.l~S3%!VYKlR ؘo \ No newline at end of file +-> ssh-ed25519 51bcvA mzB9FcwUgPczK4/Rd2DZvCYoQfjT4qE+Z7HE9yHjgGU +sPDlr+YNhvbjYagyJb/kua9dWeG9tSt6KNjKh+/p+ps +--- uZVoWpqKjapTtWRGpc7cUoifwOVFfd5DU+9pQpwruuo +Fv6ڋ,Kӆ(k~Y4.`z(]w2MV "%JU$ȫǸCG +_:Fݧ S \ 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 f677cad..fa70bad 100644 --- a/newinfra/nix/secrets/wg_private_vps5.age +++ b/newinfra/nix/secrets/wg_private_vps5.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> 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 +-> ssh-ed25519 vT7ExA WsT1cFerSGwOnhrLBTN62zydQVC1oPQxXtwQxGUSY1w +Je1zd3NJ16yaOHQD8iPX7eaPJV3WH6Z3eiDkFip/2FY +--- J6ZhIFcXF12n+pV4JEaAut/QB2c5ycYSIGo6j3nLICQ +SOƍsILJ i=m|,gnYւDvA d{ q)~3!8 xPL7" \ 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 105c8e5..d3d06bf 100644 --- a/newinfra/nix/secrets/widetom_bot_token.age +++ b/newinfra/nix/secrets/widetom_bot_token.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg sAwuep3NgetXEKK5N8ZFP6Y0IDAGtTLIXH1hh5L0Hyc -8pB7uytmRSkJMKi5S9YSLHKLgpYKkv5w2WaKaJL9sT4 ---- JucAnOMMuFLpIyg9t+Azths9ttk6by6SKcMWA6Cwa+0 -v(TR͘䴐JpD%J*^l߱Y/'zBٞ4G6Ʒ( /\,Wr7 en%@ \ No newline at end of file +-> ssh-ed25519 qM6TYg n/6/3HfVk0IWfGRbgBB7qLkEXylLgYDxNzbLTaJWyhs +jNP6viJqbOgpNke072hDeaGmApVc51wAN/O+8Gc58U4 +--- WoF4XMNOMMwKJ16Q7QrH97cGdyJ4nB4Dw04dyznfmL8 +#"Li"WAE-?ؕ~Z\gO&xv &w]"S2Vɯ/ \ No newline at end of file diff --git a/newinfra/nix/secrets/widetom_config_toml.age b/newinfra/nix/secrets/widetom_config_toml.age index 13998d281522547281dea22749b31da205b595f5..aa4e0f9a7b21f017ae63ccae56b00c56e42fc334 100644 GIT binary patch delta 4000 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 F1pre7wmkp< delta 4000 zcmZ1`zf69DPQ8D!r-g4;VtBZRNn)~PR%m#!i;JhHOS)IEXL(tYS&E-Ys=h~NL}{dJ zIhSupVQ@)yRhXBbUx2=ui?4pTQ+7~JfwPxWuv1`CWn_MUt9Ef(m1knE1(&X_u0pb( zVUACsZ@GzKa*m6>Q(kheX~gX)|)#HuG->duyRvRg1Lj6>^HkQZlQ9P*sr#%QiZ>QcFu5ot$%k_&Adkm54Qye zUMOQK556@o8VMJ+K<(zALaSL;Wvrlis$@=Wh#g7tgL?W{;I-FQ6a7+ zJJ%(b-u4S*EWW<7oN38a@0(u@8oW(4FQq^H6}iZuP(Ps|q51ZkzZ%{K%$M(p=XDw; zD!qBWGdX;}%30;wq{?R-_GM(pJE*E?PSLyPv3%){J~^GpHQ$UFa(GuemA^5LWB$-_ zul~cAo+{6udtw;()}*g&`ZdAA;H>kN6S6#qtN6_HvlC}s>J_MQG(55}>cUK^-=?v; z#S$Uha|$+oVLH3)>7Cj7Lfl5%Oc%=U+9;vrRxLfDBZ9Y3Xx`DJLr=|QY;?QSC+VhF z+xPjVMXtYe&VjXW_f$u%Ta|t38t-|V>?AA2O-<@uRf4~-FiK4dntkoUmK&zU1if@ww#S3Z0%j%L5qEejvT7fntEq8J z%0})h5_NK~t?C8$u-hs&S6wX>{ULYtIit-@QE8vLtw;a4gdc71E&BW`u%Pqp-PhN& z`%d}XJ#)^TV-081^G{nR9+_l%YP)nz>;G;M7v3AG&#!Mk=TkDrT&m+Q%bq!EtIgOC zGikj#CCK49>&(fJ8%y;}+$5_?Bm<;>TQG3kOP!{&WutWWrivwr^+yY5{@alqee8Ds z&yepdNi%sZFUeovm-1T1bk^NtU(kb=Ta0G5K6-h9O>BqP&G_+nzvvUc3sS5S=iaDU z8TS;fs&-iZ?b3DWuRRLgYhPRax+0i-^Ks^M%NBb-V{fRb-3I|FQO+p2 z#_GFG&HC+b*Cl+$d3V)XUOcnyushnHLln^4#uD78&LQMmqH zqLa*6JM4-%EX^5bli@S%APPdxYSoiStgf(EOfc7n^@KYp73ergHZ@lNqP#kFp!w`6|B zToErU^0>O$ndR$`v(M!>Ei+wJ_u;}ezLwisuRj;bS{y3v>-s0N{qTRaEoqm}xUUst zxO2Ner~I`Qf7CvWW~^B%ta zvMopWOv*#+E=k2S-r{PD!^Lh>q;oPKfBo~sOH((()<^1HXl`%)i}h<)RT!~1skfJy zOkE(w`k{B7jkVXQ`_b)>e#x72)-T%?ac*g-eDsaiN!Lz)*u^aIyWzw;6T2!_i{^wM zRqBE#Bc`}@?(hqpeTn(wjJ*%ol~QjDRv7sRu2_8Kd8+g0K&e}&X4u~}-pKV@b@`iL z7E8t1eN=eZja?w z?QfbXjAE_a|1_RfJWw*cW@4cFp4-oS&B|#@+bzgXN=R_VRlcYfrqC&{a9{dis+v4Y79#_31S; ztNd^7XcwHA5%hD%^Ps&cMQdI9*JjsCnwvkf@krZT(R8Bj+riIThYsvnmJpYINo(P! ze`|O}n2IKbv(++7<>#tTpI0KkA|Pah6aAWntJy{j69-QGi zV)?A2D){flgQCzPNhIxysIFXRQFUszoQCbn#{^?rst(SbcJT zu3TR3{QA{}tY4nLTeSM%GQRUUfm>hPHfEWY5ZlNhHA&pAY093>&i)3wS7fFB`ufD% zDd+L0C;_3`<>l8r&PAScuYAIx@TYx;9JA_{+`RHeJ^oBP&sXdpehSQU+sm|mVv?r7 z##Y1Xf>maU%avxv#U1>qr~PKpEy2j2_6nIi!k3ft-h@x7-_~+xxx~MhK69SRa!Rsn zjr_6tiO!Z)EqrJALyxW(-|F?SH}9CVEi|`KAD$<y^3#dIa#J?@D>XgJ_-+*vYjRrnv#;#mCzD^@ zz5D*>-`$g3&p-94ZL4QDZogN>_$7N~5vRh2$zjT2))uO7<2hYKmrb!cd}`JsmeOn& z_Dk~f`tC<(+uc}tt+(Y{M7A!IPjOCr=e}#HC(VyYJbGZh`+EKAr-~~Jb?(&{PM>A; z)bh=e%z~ZYtLE*0sylh69@EsDakBq=Yprh-27c$-@YFu}@YeGB%83FwFN;>5sVuC2 zR%>{zcYf~8b>?qvoT8`wN_e9fkleXFOK+Kxjm_tMD^q1D3Np zuc?a)G8@(A-3aY5OuE1G(4@uocajfI=Bn@FoO(&^e%tl;$GxNT6wYY$AK&y&#XooJ z)6xmcO?#$K5)F%0p3a&u`lO=<$XF&-hOyy=ecSvD5t8ExiI&uk&_owu=of z9-a4iSsjzrSMIYcDoahLMM*w>Qgi<7{6ij|1;3xaWSFiLS+sTG<-e(ny<+JP7%S@o z@;~VReNQ?b@^Am%#N_Me?lB+$~T5G+b11#^WT&A)%j|c!F@xaxS~gyHuZV?*G_q_lJKg1*UBT` z_eM-{o_^^>?2@~!ZhTETop1fOTb|goX~r_g7P(I|J6I-t{*zg5!n@t+S_Av9gD>LV z%v747YkYNOanGw+U&Yo%@{~)f-Cf?X=!7b-u3K@=_u|RNkBL5cdq~WT@uI{(CU^7O zIjc>|BPSbj+`e*?+ve8i1@+55J^J)~Mr3{N3x?K0v*_63hI{^rCc57q2=BHpU2EeX z6)z40jW_b3-u0%0aMvGf)R@Ob-OYnGQ6lK8l|!eQ5qZ4vDblj2|B^NJ|C9p}#RJwE1a>!Evfe=;5w zam4Qb(y)68Q`@@b-brf;i`QK~s@tV^ApU*+h4t#E_s;QKH*dw!^?Ud-9Iov8!@~0C zCes;)9nsux=O^mCXgWCU-Tc5awP_1>x&5qX+P*N_Ug6;6BinA*cb{n8w%t`|NALXI zw&D7dd-Uercq2b!S?2V83AQpm-?vz?i)^*8+Wl0?<9Dg4%d+(<7Wdb=XngGVnZNnO zc}DNJ_9C~VKT;3>k%@dA^zv-qy@vajBj3&4!{4+!=}b4ziOC74*B=RyIF%Xm>fD!k zUYk=qE-KV_bQoXX`|fnjn#@Iwr}h7CzoI$Sy4dgLQ_-*A1Y`FlFlkSS|GaD8;f30_ zrz#nLXXBOSw(d?!$Yy`}@9yhc0e|QEop|ue!Z5!|f@}5U$2|8k4ezrvthnRV|JK&y zz&@4Kr6rbD`Ljx$*Yb65{t{JrXh(;`!rGi0Wnugm=EsXq7pu1u+V^el{k|8+@@M%- zU;6qsXJXUw85cj+8y=hdY01;ph$(?Q+{X9UF48=)Wr^#mR`I89x7P0$Qk1TZyHPaN z?37wS(u|03rM8nfJle4q3UYPXvjv|YQC-07r*|gl`mc2J#p_t3jM?j2ZSF>DOgA(< zuyeM>f>IsL_uO;!Pn1i^*Yoh_ny35?>D_Wvf6+13yy-=gUOj1%7dhYX%=X%I0jBtN zgF>U1Gh?-mPPA>i6mv~bbJhx{4M~?A45z8qa_-#|KGS>h>!OY?h2<}szI|R6d~&i@ zXTub^q~e?d8mfW&m)?pG`M6!@!`)e~m0zYQeRF%dLNvF3X^OpMrHN#={t~5nEuOp= z-yZ58Pn$fCL*+uSB=5rD?8cBkGnUE}uU)vw_JZH?MZeE;*6U4S>1gxPRB$l$vx;t< zt-Ewn_pW0S*V*&KKi#xdObT-Dzn)+BJow~>cSqM}QXi#beE "$tmp/id" -echo "$public" > "$tmp/id.pub" - -delete() { - rm -r "$tmp" -} -trap delete EXIT - -ssh-copy-id -i "$tmp/id" root@vps1.nilstrieb.dev -ssh-copy-id -i "$tmp/id" root@vps2.nilstrieb.dev diff --git a/secrets/cors-school/bot.env b/secrets/cors-school/bot.env deleted file mode 100644 index b3a54fd4689c84550480ba8d489f2a0b298b632e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZQ@_Y83kiVO&0=+_aq-EDd)^j%4rRmAnj!mbZwca+`|O3>Ij?Q~#!>5J4G6QZuo zSs@kY_s(SB+b_nhKkX$gE?SNe}_ES8&7yhglAM>+n*!$p&o zyc3;&|97ukF3a__-~MQ993RL16nA4`Rf&|x$DV8d-@jvi)Vs;|ZsjgMx@+C~_>8!c zMe#NLy*m?3LW9Bu&YG!tw!9MO4w(Kf@~5+Gx6p&Qh(6YPy_4i-r#Q>}ln6iAl(Xkw z#`{H?-{Zfy>&y%FODOL?_Hw7o!~YhGZd~eaoFVpa(&l}erc2ccuipJ=^7TsxB2Jy) zxA^Gx!T*{ZQ^i%eQpv0Do?ochlvo*+sh>ZGMdw}2yvTkB%XzZ38=p;8o!F_Gw>8sp j6Zh4HjOu!-OR|^ABo}>4-d9~_Bi2yLpg6O*;&3AX%VW2D diff --git a/secrets/cors-school/db.env b/secrets/cors-school/db.env deleted file mode 100644 index 6954a69f5775a9b1da502539fa80ff5d9ac92d8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmZQ@_Y83kiVO&02>NSSnOG8)y<~@}^Q2JM>WX7LXVMNo+4(WUxGB35* z{VCd`+8CPSHmz-+iSDDr9X8p=7!!23<6lg1Z)9G7Phj7!bNrL-WrN*Asv_s!Q*!OP Vuuax)qr9tJ+`jfT{ZI6M0RZRPVLAW+ diff --git a/secrets/karin-bot/.env b/secrets/karin-bot/.env deleted file mode 100644 index 14409114d112a93623b9ee6ce75a2d0d4527c9d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmZQ@_Y83kiVO&0*vSnM$nxDssf*WxQN$q*R3&m$o_d% z=h0@Tf39;5+}702^SI5?cXh1t RZ0|ZDVarz`3bU#cy#ZDLX(Ipt diff --git a/secrets/minecraft/.env b/secrets/minecraft/.env deleted file mode 100644 index 86936a70c6b52d74c361d39eacd33b183a295d21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmZQ@_Y83kiVO&0SkZhd-ss&96Xic ze%tAPG84>yWV|*GeY$*2h2d6H8-vJ`8j>kDzFml`eAjXE&|dRJ@xQau^HWw{oU3wg zU)9kl|J@5VZ