diff --git a/newinfra/nix/apps/forgejo/default.nix b/newinfra/nix/apps/forgejo/default.nix index 933fe24..1874cd1 100644 --- a/newinfra/nix/apps/forgejo/default.nix +++ b/newinfra/nix/apps/forgejo/default.nix @@ -1,6 +1,6 @@ { config, ... }: { age.secrets.forgejo_s3_key_secret.file = ../../secrets/forgejo_s3_key_secret.age; - + age.secrets.mail_git_password.file = ../../secrets/mail_git_password.age; services.forgejo = { enable = true; @@ -34,12 +34,33 @@ MINIO_LOCATION = "garage"; MINIO_USE_SSL = false; }; + + mailer = { + ENABLED = true; + FROM = "\"Nora's Git Server\" "; + PROTOCOL = "smtp+starttls"; + SMTP_ADDR = "localhost"; + SMTP_PORT = 587; + USER = "git@git.noratrieb.dev"; + PASSWD = "Meowmeow"; + FORCE_TRUST_SERVER_CERT = true; # lol. it's localhost. + + /*ENABLED = true; + PROTOCOL = "sendmail"; + FROM = "git@git.noratrieb.dev"; + SENDMAIL_PATH = lib.getExe pkgs.system-sendmail; + SENDMAIL_ARGS = "--"; # most "sendmail" programs take options, "--" will prevent an email address being interpreted as an option. + */ + }; }; secrets = { storage = { MINIO_SECRET_ACCESS_KEY = config.age.secrets.forgejo_s3_key_secret.path; }; + mailer = { + # PASSWD = config.age.secrets.mail_git_password.path; + }; }; }; diff --git a/newinfra/nix/apps/mail/default.nix b/newinfra/nix/apps/mail/default.nix new file mode 100644 index 0000000..14b2924 --- /dev/null +++ b/newinfra/nix/apps/mail/default.nix @@ -0,0 +1,24 @@ +{ config, ... }: +let release = "nixos-24.11"; in +{ + age.secrets.mail_git_password_hashed.file = ../../secrets/mail_git_password_hashed.age; + + imports = [ + (builtins.fetchTarball { + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz"; + sha256 = "05k4nj2cqz1c5zgqa0c6b8sp3807ps385qca74fgs6cdc415y3qw"; + }) + ]; + + mailserver = { + enable = true; + fqdn = "mail.noratrieb.dev"; + domains = [ "git.noratrieb.dev" ]; + + loginAccounts = { + "git@git.noratrieb.dev" = { + hashedPasswordFile = config.age.secrets.mail_git_password_hashed.path; + }; + }; + }; +} diff --git a/newinfra/nix/hive.nix b/newinfra/nix/hive.nix index 6f8f97d..b724da9 100644 --- a/newinfra/nix/hive.nix +++ b/newinfra/nix/hive.nix @@ -178,6 +178,7 @@ ./apps/cargo-bisect-rustc-service ./apps/killua ./apps/forgejo + ./apps/mail ]; deployment.tags = [ "caddy" "eu" "apps" "website" ]; diff --git a/newinfra/nix/modules/caddy/vps1.Caddyfile b/newinfra/nix/modules/caddy/vps1.Caddyfile index 7a6ea25..f195c85 100644 --- a/newinfra/nix/modules/caddy/vps1.Caddyfile +++ b/newinfra/nix/modules/caddy/vps1.Caddyfile @@ -65,6 +65,11 @@ git.noratrieb.dev { reverse_proxy * localhost:5015 } +# hmm. maybe for getting a cert? idk. +# mail.noratrieb.dev { +# abort +# } + ################################################################ # redirects diff --git a/newinfra/nix/modules/dns/noratrieb.dev.nix b/newinfra/nix/modules/dns/noratrieb.dev.nix index cd9a438..1f0bebb 100644 --- a/newinfra/nix/modules/dns/noratrieb.dev.nix +++ b/newinfra/nix/modules/dns/noratrieb.dev.nix @@ -69,7 +69,23 @@ let }; uptime = vps1; does-it-build = vps4; - git = vps1; + git = vps1 // { + MX = [ (mx.mx 10 "mail.noratrieb.dev") ]; + TXT = [ + "v=spf1 a:mail.noratrieb.dev -all" + ]; + subdomains = { + _dmarc.TXT = [ + "v=DMARC1; p=quarantine" + ]; + _domainkey.subdomains = { + mail.TXT = [ + "v=DKIM1; k=rsa; s=email; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCjY7PTXNR6CcLiBrv7oiJtXmtRwJC+aQQL4mLMGLCEqtBXA74NiXvW0AP0/BKtVnoWlDJRXWfnB70T9SQerF/BWq8kjlyMmkxex/QuiSDZWLLRpmL4AZ3y7CQY0r++zROwIrNTX95mWAeAlFd8Ug3gXD9lCml5jwM7C3YyATkKMQIDAQAB;" + ]; + }; + }; + }; + mail = vps1; # this needs reverse DNS as well # --- fun shit localhost.A = [ (a "127.0.0.1") ]; diff --git a/newinfra/nix/secrets/backup_s3_secret.age b/newinfra/nix/secrets/backup_s3_secret.age index 33cf448..af7bd7f 100644 Binary files a/newinfra/nix/secrets/backup_s3_secret.age and b/newinfra/nix/secrets/backup_s3_secret.age differ diff --git a/newinfra/nix/secrets/caddy_s3_key_secret.age b/newinfra/nix/secrets/caddy_s3_key_secret.age index ec58e07..4a6363f 100644 Binary files a/newinfra/nix/secrets/caddy_s3_key_secret.age and b/newinfra/nix/secrets/caddy_s3_key_secret.age differ diff --git a/newinfra/nix/secrets/docker_registry_password.age b/newinfra/nix/secrets/docker_registry_password.age index d975c53..1f86093 100644 Binary files a/newinfra/nix/secrets/docker_registry_password.age and b/newinfra/nix/secrets/docker_registry_password.age differ diff --git a/newinfra/nix/secrets/forgejo_s3_key_secret.age b/newinfra/nix/secrets/forgejo_s3_key_secret.age index a62b401..9b3863b 100644 Binary files a/newinfra/nix/secrets/forgejo_s3_key_secret.age and b/newinfra/nix/secrets/forgejo_s3_key_secret.age differ diff --git a/newinfra/nix/secrets/garage_secrets.age b/newinfra/nix/secrets/garage_secrets.age index b9bf376..242b911 100644 --- a/newinfra/nix/secrets/garage_secrets.age +++ b/newinfra/nix/secrets/garage_secrets.age @@ -1,13 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg SovdMEtsuAN3HnwyoGcQsVtcpYObyh1N/VKbw4rN/B4 -neYvPr3H7Z0n42eXSacdJ2syK2tX4ZG8dVzdXYKMC3E --> ssh-ed25519 XzACZQ O2zwX8G4Ladh+jlPtzvGKBJUCZwRdzEFBZMjQ6utlic -EuxJbsnCtMU3iPGL+rtNPiA+r6h9IBHQGOo1krTSGMs --> ssh-ed25519 51bcvA +ytU9agDEYXwSkjGXqTuGJFNX0H4gVg3NrSq+irpqR4 -WqB9xcniSoq+7MPZkeujE+Z5Et8q3u+/yEULeSU7Ka8 --> ssh-ed25519 vT7ExA NHrhD8lzaN2QUvnU5obIGFsFdC1tvADd7cfNONcvdGE -egoyBBL9r0XV0bGOq+686PoOPICvYnE/erlZvQMJ4ps ---- j+CR0XGs/Z0D/f8PJVUu5m8ksetR0X9UgX2uLgRFGtY -qRKSDE**ѸW672Z(}vҷ+Gj|'?_o(uͨ! +\gg`dIr{#d;(U(M(hkr6Qn!rB_2) -^b8R\·a -]jBD%2`=Hz \ No newline at end of file +-> ssh-ed25519 qM6TYg a01Mb8F1M4wvxfMPgiblbRIwMF8fmfNJL6Vg8/YVB0k +RvtuLzhlAlOas/csoqOILvMWLmd9nUZHn8CEVRiVVVA +-> ssh-ed25519 XzACZQ 84YS7OyQwf6CnQR1DE59MkFrtFuPPG1Fxo7fRTQxuxM +Js2crB6+BrhZD3EBMYhvkYA2JIA6Abu4hCn9s6Y+XH8 +-> ssh-ed25519 51bcvA uZOqMPJ8PfnbvGN4Ng0xdAVp7PzwYceTbY5gUFmF1RQ +BLWEi+9mkVts2YGbWM7Pk4m/CGlI91Z2woCWVLjejhM +-> ssh-ed25519 vT7ExA H81EQWjjh+yhmMKkyoAJ6HUIPCKgo+zWiYu9KU8NWgg +Sx8ZEAI+AwKR2GB/HN4Uh53U4m3ijuVHMKaHTXYaKL4 +--- VvqdE02fxeV+wtdgB5nXH5lGrjeVC67T2s/yfefX2fo +S=]mñXTIN?ʮ頴v%ՐIwN_*7$]e\]H PMB@&'GgeB`]*tRʩ~G(u ssh-ed25519 qM6TYg H4CAhH2tiZgtdBLnIT2NQpwbuuJIhX2fku6ukjFHonA -jqQ4SKoyG+lIN6nFtBkUPsPLbQtQG1McRrH5BSjMmbk ---- Gxbst2zgWl8yZrCCami4TA7/bXRE84sI6FBjnzpPsiI -ȅr -T6[ksiĖ\'~K I%|hƆ%NSt YҎvS`*3_;fɰ/*!q-^CkA7R <64h*vjYVS22ʮRE \ No newline at end of file +-> ssh-ed25519 qM6TYg /d5HdkEI5g3P4GS7g9TfU5BlaoSGhsH24LltCJPWjxQ +skmJHnOEUBeuGGG0MTrXwm+vZ2qhHZ7O5Jlkw26zsyE +--- syAIyV5No00292U+MKrUCW2oAVovXPI7w87+cLhA14Y +fa;gO%<? +۩}{p"G_Hn~S}EiV2Ce&.o! +rz{OsU?THpg,)+G? OZmt,)O/A/R=TAw@Ik|\; \ No newline at end of file diff --git a/newinfra/nix/secrets/killua_env.age b/newinfra/nix/secrets/killua_env.age index df30832..831fb74 100644 --- a/newinfra/nix/secrets/killua_env.age +++ b/newinfra/nix/secrets/killua_env.age @@ -1,7 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg PhsRpnRNKtBDBgPzuz2WR1xnYYeXmaKRXJkuDXs0/kY -CEGO4vHUCcdmjEAspcJwcvytCjWoYC0IJ6WdMxvWfnY ---- +45DrLBwIK2qjumiVVbDYoPUxzNMLkDTOWToh5JiH18 -#%-IB -xoI΋įf?bmep#ve"mSD ނqRNG|*үU* -bI!8M;$;Ū`d!#ױ^{ \ No newline at end of file +-> ssh-ed25519 qM6TYg Ljc/q7DzP9ArvolUWvU38h5gaIflWWSlBzIbHFogqAU +U5nw0yFT/3cquMvWWXnxHsiwYl5r7oF9M2OfSATfC3o +--- K0sRjFv6dEc+SA+N7w4mBuW4ImeaFoyAX715KUjv7pU +$fOŋmakjnхN*RBkP=޿ZF+'>U]fU46N/#"vpq(6&u)= \ No newline at end of file diff --git a/newinfra/nix/secrets/loki_env.age b/newinfra/nix/secrets/loki_env.age index e2ecddf..b5cc250 100644 --- a/newinfra/nix/secrets/loki_env.age +++ b/newinfra/nix/secrets/loki_env.age @@ -1,6 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 XzACZQ eBMqugfTB9wfhD2TgF2svakZ0tDdXjfIlurhXBf0+TM -vJoHbSZT6BdvWfwcQVtjBUBa0x3b+Va6SyOuSL4soKY ---- eQQWdfE5bnx0EOu+4IzdlGwPLBEN6AAC8xA0u6/wXhE -}2T? ;1t7kJO{Ǹ$ -3uBAd>tfrX _=jR>^!Q;`[F!VrΠʍM_SDGvaT;PhiͿ ]O< \ No newline at end of file +-> ssh-ed25519 XzACZQ 9FVUVdZgKOJ0V8F13YgZluLb2DUB65Kos60TwnqwjDY +Y0Rr8I8HrOWh4u7meJ2TMAI71BwD2a9im1igfVQbE4E +--- 4HaBTgUQ1Dteil435vb/NdUm5jrLnrsCuRkv3Cn7KY0 +b*VEY[Jl.L)ziDYJ" ,8N֧)J -}uKԦ괓vm΍)0?D"{e~FP χ~R[H 3cD!"_rwê-:'M \ No newline at end of file diff --git a/newinfra/nix/secrets/mail_git_password.age b/newinfra/nix/secrets/mail_git_password.age new file mode 100644 index 0000000..74e58dc --- /dev/null +++ b/newinfra/nix/secrets/mail_git_password.age @@ -0,0 +1,5 @@ +age-encryption.org/v1 +-> ssh-ed25519 qM6TYg uAqVnSxmOpnCA38XN6oivgsD/lyG7ykusArboDTrRns +lNpNjvxm/Mv5eduK3ugSPFRv8TbXFt2LyalXpfMGyz4 +--- Dyo4Q5YEjqsO36Q0k/V33qmPgJwDlthpEWA+hWcKI4I +a ,l9-Y0[7kNLmk!dSWo)98%R`x \ No newline at end of file diff --git a/newinfra/nix/secrets/mail_git_password_hashed.age b/newinfra/nix/secrets/mail_git_password_hashed.age new file mode 100644 index 0000000..266aae5 Binary files /dev/null and b/newinfra/nix/secrets/mail_git_password_hashed.age differ diff --git a/newinfra/nix/secrets/minio_env_file.age b/newinfra/nix/secrets/minio_env_file.age index b44c59b..df2fbd9 100644 Binary files a/newinfra/nix/secrets/minio_env_file.age and b/newinfra/nix/secrets/minio_env_file.age differ diff --git a/newinfra/nix/secrets/registry_htpasswd.age b/newinfra/nix/secrets/registry_htpasswd.age index d7ce43d..2efe7f0 100644 Binary files a/newinfra/nix/secrets/registry_htpasswd.age and b/newinfra/nix/secrets/registry_htpasswd.age differ diff --git a/newinfra/nix/secrets/registry_s3_key_secret.age b/newinfra/nix/secrets/registry_s3_key_secret.age index 29337b3..c950cb8 100644 --- a/newinfra/nix/secrets/registry_s3_key_secret.age +++ b/newinfra/nix/secrets/registry_s3_key_secret.age @@ -1,5 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg +1+lVyRzlcwO+TvDJ3KqRwVzLrKN6QcbeplcJufO2A4 -tXc9NbF/9R+O0NN1SRGWFc1rClgWMm19EXwzO6YeYmk ---- tWIhucD14hJ/tIclvObWwt1a/ImmiGoCNFacoUkYLeg -c_βVgF>'U&H9O㜖zkҩTڄC%/kҖMg5:/J3jPC|v^3Pw/ߔc% ?Z<0`ݴ0x@ړ)hc0=r&. \ No newline at end of file +-> ssh-ed25519 qM6TYg yDDOCWqwZ0A0Jzrc8SxnHiDqk+k9W3n3IiBGMe6jIXg +nr7QkM3n5VPWLdaa7ULm/fECB0dIbNj5HI0rzZJ6Rak +--- 475p+3qWPouhETFhSWC1Y6qilwbEqQKePX3ggzX8Kx4 +=5],3CgOe+go$b̐n郾aapF +Ut'@vxRv3 $a$ G9JYɢW ac, +R}|1doP>ż|ʱVpl1]/_~兵Zz \ No newline at end of file diff --git a/newinfra/nix/secrets/s3_mc_admin_client.age b/newinfra/nix/secrets/s3_mc_admin_client.age index 77cb7be..13a6f17 100644 --- a/newinfra/nix/secrets/s3_mc_admin_client.age +++ b/newinfra/nix/secrets/s3_mc_admin_client.age @@ -1,12 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg FkczCU/BfhftxpEV9ss9j6bzva9SYzsQXfS2HIPE904 -QPsvkT9e+lGp8RHXkk7Xi5aDnJ7SRoXtZYUHxrLv5+E --> ssh-ed25519 XzACZQ bgFJ0eG0NvrZmpMNcw1w9F4IHIlLnFGzYDQuss9zBzc -37D3BzLM2c8liEJ62Cgi2Ujrn8s/HuFooi4W4efTVF8 --> ssh-ed25519 51bcvA ya2YZ58aFvoZ4RSAIvcTxHs2mi9IQ6GLBBIdd7u+1AI -he/Zml20KK0SCcl+yPP07rVTm3ZfNrM++BEg7DN3m1w --> ssh-ed25519 vT7ExA acQVs42HeDArkdfjcKrSSKIyqGUo0A/WOFsXwC5XfhM -98Orc6jiGZkJBtRfivoDUT+sQKEsX9VhpuE09iMkNmE ---- VUt5MXChYk8dXHeZ8YpfXhRE94BftWknhqf2RI2z77s -,1` yGkqvY˩x#3ދw/WnkG +[wRR.nsT! .2rXJZNQD~d}" Mt " )v X? :]-ʱx#e` UFW>F3ڋe0;:lf-5nU5^N:9'ediJ 3;W R)A5,ժAqyGNBxԐQr2515RsqDwѾ ]e9h O -1e8 \ No newline at end of file +-> ssh-ed25519 qM6TYg 8oHVtbvlnyyCt27qGnpFVmypqIcOlR0DUuJvyMS79QQ +12LwAXfZerltpMV8p1fxQDFrAsT0anEFHnCflYlpVQ4 +-> ssh-ed25519 XzACZQ JCedQ77yU0L72s99WlxyqOrvE2oQpILCzT+Wgl/I1FM +KMJz03/cK1G2rTyAqLtXd9UqbJsNL4hlhNrUy4O7+34 +-> ssh-ed25519 51bcvA FikH1IoTgILH/r+cUFDOKatPEJJ1cgQaq9tQPUgNzAY +w0A7GG7xtPdidDxU6+pruVBqIJXZg8c2l7TnIN73T7k +-> ssh-ed25519 vT7ExA ++vWs+ssMLjAN6+Pc71XtrKYfsn6uUzF8RAj8ZEVg1A +VnweoDKsFFLuH4PB6ciwhFF5qCkY5I79yQFaku6YvTI +--- 15jqxRdKGbvhLQH0IECslHLRfG7ubREncsEoYNLAPQc +g[%B7si\ +4bKvoo\ ڂ>cbsb>;N5Q : EYbqK|k{&mIy߶-a3]_ 3ߌ)Q{,D* c}aR\b,qZ ~"ݧh͛eJUI S%Us"#$ta;s'iEiHJ]G0 @K Q|&/g$O pϻy=7(yH`!g \ No newline at end of file diff --git a/newinfra/nix/secrets/secrets.nix b/newinfra/nix/secrets/secrets.nix index dcb12f3..4f631ed 100644 --- a/newinfra/nix/secrets/secrets.nix +++ b/newinfra/nix/secrets/secrets.nix @@ -22,6 +22,8 @@ in "s3_mc_admin_client.age".publicKeys = [ vps1 vps3 vps4 vps5 ]; "killua_env.age".publicKeys = [ vps1 ]; "forgejo_s3_key_secret.age".publicKeys = [ vps1 ]; + "mail_git_password.age".publicKeys = [ vps1 ]; + "mail_git_password_hashed.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/wg_private_dns1.age b/newinfra/nix/secrets/wg_private_dns1.age index e56c44a..803f5f8 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 C/Xxl6xmqJU17rLrtktvdLeRY5/bF3bjftHo4mbl1iI -dLiactDlpelKogeTFl2fD6YjAK1dfFd7jnvrgc7m4O8 ---- LARr+mBHSH1Hn7gLprVSZdL5/MK5zEmwWnkAYH0Q4T0 -2+V(s -RP>azZ>y>rJ瑸!>KEAap y~ 艸SCW-& \ No newline at end of file +-> ssh-ed25519 LZU5Eg E6+nwA+8+AV8LR3I/ElJZhquSqsQyO7frN9jsbgytzU +sJ1+1K50iqMTp0pzDpt21nX51puxnDZyHO7GsmEADrU +--- FR6LDD8Sctimyq+6yWGqYid3bLHn5c/73Wc723Axpho +atEQmZ녳g"qPwYҀI._*STð$S1gϾ \ 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 3640ef1..67e98f5 100644 --- a/newinfra/nix/secrets/wg_private_dns2.age +++ b/newinfra/nix/secrets/wg_private_dns2.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 5bWSnQ LZJ3IeeU2FcoStl7FVMbL0zttZEWy1t+E25GEqXdznk -hMIVGygEe++AfccTi15wj6rWaqtwsOabUugtiuR5GWI ---- /YFZvkG8jK+vVp+edwEpbkDiAe0yPvwzml6d1HOynI4 -LO_'cݏ畊=]Qڗ[?٭o3MN6dV?RAW x5kc \ No newline at end of file +-> ssh-ed25519 5bWSnQ z5r7U+NKzZ4ucf31ROA2Ovq7D1kRmMs+Y/LX/ArLij4 +kMHCxu+ZfE1qfV9i6wZMwbWX/BycwrmB9yykLq6Av3Y +--- 5PYzMW6WzLKk/rBRLja3rziFDIRsJV1a3UC5fd3eW58 +pk{@F5Z+֖OPK2k x[˫uǂ1ދ쉷b]A}ۇ1B[=ǥ] \ 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 152a0ee..14265f2 100644 --- a/newinfra/nix/secrets/wg_private_vps1.age +++ b/newinfra/nix/secrets/wg_private_vps1.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg wMMdxXZc1yZiD9oS6ne/7Ne29uz+Q97kYYjZtyhR9Qs -hNwS16RMdvb7hNfjRdUow/sYtUcta4YPoe4qh0jAEOE ---- 30m6ILfUyjxm/nindgNcujh4bGOUvMbrcArSLEd2NuI -0f-1T_s>?fI[LύmL4#,qwPY-[n$ 4 \ No newline at end of file +-> ssh-ed25519 qM6TYg CWXbbkmqJ6xvFW1QH/WXMz2yyqrufcny3u2IVhQcTmY +EPHQm64I0DsM7wM+QDVsTxFD7+RTTBuPLBGp56PwZLw +--- xMf8HUGOwVESa0eJG2QY9gzPX4uMax9zKj+M3VTRTRs +ƣق(U,̈+0q> }ey0Q#\_,в*Xr< \ 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 80bcbf4..f2df3dc 100644 Binary files a/newinfra/nix/secrets/wg_private_vps3.age and b/newinfra/nix/secrets/wg_private_vps3.age differ diff --git a/newinfra/nix/secrets/wg_private_vps4.age b/newinfra/nix/secrets/wg_private_vps4.age index 80365e8..c3de33d 100644 --- a/newinfra/nix/secrets/wg_private_vps4.age +++ b/newinfra/nix/secrets/wg_private_vps4.age @@ -1,5 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 51bcvA A5RlnDQ8XJQK5KqxwrvVsrfJKVzb22/c/J/EPvfhtRA -ByXVkK+QIuGV9bCgcqYOAj54k/O6SrYBLrJIQMec0nA ---- S+1ZbskI6F3pIT8Pm9qjoHpHu0BmihvC1c9D77sghVY -{XwG*KD_r;9O"s<әCb6#lQa ssh-ed25519 51bcvA pmuYvcNSDbQQGppe1oSlOjpzgTZsIWdnDIWAwcWOhj0 +TTWgR+OI5SaRvxaXc4LKBXQtMVYc6Jp+r4jNDlI5igg +--- GSEVCJz6eYrGnFbxiQSkZR1Fp0Fy+nga1zOe6Z6LetU +yHT|2| +B,"~艤xIGxDQDƢ|b< +)hd‡ \ 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 079f000..75e4636 100644 Binary files a/newinfra/nix/secrets/wg_private_vps5.age and b/newinfra/nix/secrets/wg_private_vps5.age differ diff --git a/newinfra/nix/secrets/widetom_bot_token.age b/newinfra/nix/secrets/widetom_bot_token.age index 367f0cb..16ed0cc 100644 Binary files a/newinfra/nix/secrets/widetom_bot_token.age and b/newinfra/nix/secrets/widetom_bot_token.age differ diff --git a/newinfra/nix/secrets/widetom_config_toml.age b/newinfra/nix/secrets/widetom_config_toml.age index b3bc49c..823d8de 100644 Binary files a/newinfra/nix/secrets/widetom_config_toml.age and b/newinfra/nix/secrets/widetom_config_toml.age differ diff --git a/newinfra/secrets-git-crypt/mail_git_password b/newinfra/secrets-git-crypt/mail_git_password new file mode 100644 index 0000000..733b721 Binary files /dev/null and b/newinfra/secrets-git-crypt/mail_git_password differ diff --git a/newinfra/secrets-git-crypt/mail_git_password_hashed b/newinfra/secrets-git-crypt/mail_git_password_hashed new file mode 100644 index 0000000..b3eb55b Binary files /dev/null and b/newinfra/secrets-git-crypt/mail_git_password_hashed differ