diff --git a/nix/modules/garage/default.nix b/nix/modules/garage/default.nix index d50d3c5..dcd4ce9 100644 --- a/nix/modules/garage/default.nix +++ b/nix/modules/garage/default.nix @@ -15,9 +15,6 @@ in adminPort ]; - systemd.services.garage.serviceConfig = { - Restart = "on-failure"; - }; services.garage = { enable = true; package = pkgs.garage_2_0_0; diff --git a/nix/secrets/backup_s3_secret.age b/nix/secrets/backup_s3_secret.age index 6b09fe8..66ab603 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 1c4045d..9eb6b5a 100644 --- a/nix/secrets/caddy_s3_key_secret.age +++ b/nix/secrets/caddy_s3_key_secret.age @@ -1,14 +1,15 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg BxjIfYxJ4bDNqcPtOQ2ULwIJqPDOlqOB2f1qnZmYgyE -DF9EWZcCG9ZfM5fpIINon8e+u12sjMbYzQiYrGAsG9U --> ssh-ed25519 91VHug Td9lqubyv+A2F/B3U0xKUhaKj84I7MlnzrJmA9HY9E4 -YXZ1M5gI9R+raB0bKBRURTx+T1HjKKvZpAx8/ibJOPI --> ssh-ed25519 XzACZQ 2FUM866jgfD0Sd3pqKOW8Sgep4HKTrhkg4WrQvUCGVo -/k/E+mu8i5cpgKtt81Gg70pps7V98hrRN++tl/cEk0o --> ssh-ed25519 51bcvA SSZDG8t82ai3+JZXB9QC2/iPGHNO3STJ+SshAHsrPwk -LSy1O1XjS3rEd1omeLr/j3o5THIYi0Qn2oKvJGCdF98 --> ssh-ed25519 vT7ExA tztV4B5a++o2nSfRKwJSsJ6N1vjJLrePUum2YpB8AlU -s8Qza4XmdKpVSV9x9u/y2QZ7QLZNVIswCpqi5syEkSY ---- 3OWTp9ctkxFVhFw64GDeupOLqBNNyxo8l1PEhUmr8cI -nX8# ssh-ed25519 qM6TYg hQG9LZz7Qh6NCTZSk4Y5CNtGl4GihW1OqtXp2rdbbjw +DxuByEkKbGYJtkCxbXwaoy4p0jX4PI70fg9ixU/URgc +-> ssh-ed25519 pP9cdg uC/grSHbAxxqfY5jkDIuD2ZYXIR2GlmQQpUa0tkXyDA +WIwa6raFDG5efaJKrRbwNB5BEJGs3gry6y2kS+u6pak +-> ssh-ed25519 XzACZQ Hkj+CnoG+3McawoOwe5DMcfYy6v7U0QcTkJdLG4kygQ +RTLlOes6nTaj7rh/Dbq8J0hdH+9A3mAb/p3SmNIGkxk +-> ssh-ed25519 51bcvA jV4FZc7UbaD4T/4GGKCktmFiJ8YkU+E/OSbaJWbt7wk +L3b7Pfgnjy4gs1FUtJVB60MZRuKiBNgLKo9BAzSUTTs +-> ssh-ed25519 vT7ExA YJ0BC+cT01ormSq/VR9v+iasgS2W4nCvpIVd3XDMOzg +Gw5dJjdzIkQcKJPqUUVGDO/b4LxVGCGNkLUxWTgOcEM +--- k7iWEdCJfxGJZ15bFIweylHp49IJu1PlFdS5cuKgR04 +{6;`,Orrw:.1E +^ps0eE!>wA [2VZaw ̋(ջ.׻}2հR䖚}I/g[Y=z·/S"Ec +-I \ No newline at end of file diff --git a/nix/secrets/docker_registry_password.age b/nix/secrets/docker_registry_password.age index ac42c39..51d82f7 100644 --- a/nix/secrets/docker_registry_password.age +++ b/nix/secrets/docker_registry_password.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg 8JUZfDdX9AEAdOITGWTvE7DRH7VPUqsM9T7u7AhExlQ -UJhh3gVlfXc6ij/DFdd3a4I2QfZu8mZ0CrLaotxQ+Ck ---- eUV5GMuqhgxWHxZZ5Ee3QobSg42A3ja8h1nuxAeWt1Y -DѬvZ_%CF._:R1UjOP+} \ No newline at end of file +-> ssh-ed25519 qM6TYg EuWuwScs5A1DFpXrWif52YGxrscegIPGS7ZpoVS+7QI +NsTXnjIRz7G8oNAS9MLRPkDSS7LNogLBK9hJBaC3qXE +--- 4dEpELTzVN+A2cdD25L0A1iU8YKoB+249GEn1lxZzU8 +ũ(';C5QOജ\]W('NZ?2f^iBcҽ + \ No newline at end of file diff --git a/nix/secrets/forgejo_s3_key_secret.age b/nix/secrets/forgejo_s3_key_secret.age index 29ccd9f..26900b7 100644 --- a/nix/secrets/forgejo_s3_key_secret.age +++ b/nix/secrets/forgejo_s3_key_secret.age @@ -1,8 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg UP4wmNgpJ9JErCdgk4oCAjwVw8w8MOE9IRdZfDADYgQ -xXd++OFcjJvkyYzow0WAVy0n2AV/0MZUXy+MYbIwZxo ---- 6aQIiK6E6tp6wXkaRdJcMfVYHh5zFzSmL9r2iU60wEo -Sps}z - -@\H_) U۽圁* -J48i]D+_u,Ζ2mj(.ٯlA \ No newline at end of file +-> ssh-ed25519 qM6TYg 87cGJ52WhU1xh3a4QSpDtOrfmonf9YE7NtfZD5UvRQQ +bvxaucwpWGnlDHNMjG5gJEGRVn1jCg6/RxYpFvlaQio +--- umLbtzmXAZRbYIVbYjyHuorrxgxR1cctk5RYwm1JnYM +Ki4t"pL&Mh%qF#$ͥNA~L"H Bc7~ܞ/ wŘh<4PcN?.BO0*X_ɵ?L!О# \ No newline at end of file diff --git a/nix/secrets/garage_secrets.age b/nix/secrets/garage_secrets.age index f5d9cb4..bae6281 100644 --- a/nix/secrets/garage_secrets.age +++ b/nix/secrets/garage_secrets.age @@ -1,14 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg P1fCQKmzsmKh0JnB185cO8KhfJ1Nyf9c4Ld90TdMg1w -quzrkpAmOStHDT1CUwE7hMBf5NyoGZ/tF0vUatVGrl8 --> ssh-ed25519 91VHug C6sFv6lpxgOQNnABrtZEwv82n71wzKo67dQ4hE0LaW0 -dkHAjqWF201gRr9DivqUfycT3/lkrhDJajUnxVBaws4 --> ssh-ed25519 XzACZQ 7OpgE7ZvoFOd380AkrS4wZZQtpiXwKG9xq+w5EzzxD0 -w4aGa7AUwTvcl6DEfwJhFp4uOD1gyQG+MZkgUCHN5KA --> ssh-ed25519 51bcvA pYE+ZDrXfjSf0cKBZwo0OZ4BXQvTZhDll9/fn11Mj3I -l/2Z0lN2irj216+5EEIDvRd2sGWFCWWnqOXqGUtRR1w --> ssh-ed25519 vT7ExA 9WGSmvdL9I0Hv6aPPQgUSEXmUBfJfv6Zbi3ywG2BBTQ -qTsDY/NN/RVJcznCjoGC0ABYhWaorzEBB206X214HRo ---- yUwt0ca0wolODUhl1JwYyiF4PoLzd7N0KkEef9de4YQ -i@>jPN+s6V+8eL", W1~(71Nw2U1uOݘ8cIamc_9~8IŀÖ~.К(Tօ Rq ssh-ed25519 qM6TYg +ZtvDoar2xUhBMyQFbxnxkwdF21rM5YUCZZ6CEknHj8 +wThjMiqj5tMscA3abmnhIVMAzfudkcIso7a17//FcDU +-> ssh-ed25519 pP9cdg svRAEsI47g14ZF2YwJoxAn7zASjOHBLNEYkk8ljG00g +WtN98vYIJ5Z8GQoaabeYlhY88OywHxp/nslKjXeRcVI +-> ssh-ed25519 XzACZQ 6Pb4Xab6o/AyuXfLW/Ii1ogeFfT8WvUjRu2NCeMlIVA +krn+6YjMq/FxrC6Pi4+4CA6Hd/HPI597SKFStO7hEgs +-> ssh-ed25519 51bcvA gmx/B0WeJxVMkxa+b+LalVYDr4CP7Uv16QcrAAvOiC4 +1dzMXakXJuwx97ClerylljgKb3BlB6kiX8cpRWFOpQs +-> ssh-ed25519 vT7ExA RNqHGxsZh8kMGy1B4GfHSE2HsJTjrjdYktVZAVSz8m0 +s4KvnACKfmNIgDz/HOUDS+z1hafjavonAntovcOr7F8 +--- 4TNQG6H8EqkGMtPysmKmJoYqZkRsNdlmGLCwsrkmQbg +АrPo`SMI/ q͚y ?b ^k Қ8*:ފGAvb?wWKw\E$ E edԏiSs/2gG"_*M%ܲzL{D|JP> skGCҠI\jr@N).g{ \ No newline at end of file diff --git a/nix/secrets/grafana_admin_password.age b/nix/secrets/grafana_admin_password.age index 32a39a9..4c1ac47 100644 Binary files a/nix/secrets/grafana_admin_password.age and b/nix/secrets/grafana_admin_password.age differ diff --git a/nix/secrets/hugochat_db_password.age b/nix/secrets/hugochat_db_password.age index 29bd6d1..f0e0305 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 17ffe17..61fe20e 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 a612e8d..980ab1f 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 d35a568..a1b8f24 100644 Binary files a/nix/secrets/minio_env_file.age and b/nix/secrets/minio_env_file.age differ diff --git a/nix/secrets/openolat_db_password.age b/nix/secrets/openolat_db_password.age index b33e54c..208e397 100644 --- a/nix/secrets/openolat_db_password.age +++ b/nix/secrets/openolat_db_password.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg pRIGgZ18vRVv3Xb8UvBxf/7uJEA/8wNkfmEyRt/h8FU -989nqkQXbqnNFtKKQXTDrtQjyhGMGmAbC5gbKprONjo ---- qOtAAS/QFkZO5gBroy/m4/Iueg3Z52LLwD3F5RCI1IY -n޺rw#Qje^wn.K?7"+27Hk0l+pxW|?kz ssh-ed25519 qM6TYg nFtXAacXhJboR+gfX7x/jtJd8ApDl3tbPezVOKZYeAE +Ca6eA7o/b3DV+fs2RqZzyDbgu8H8rQyFmMMr28f8uOU +--- EG+F8eM/wVjXvWKS7leaOAZJnjlkT+JRJKcnAC0iWKM + :,L߾9IBңw%hӧàbžcb~I睸&\NmT4O0j2[o+(:|虜|9czEuu aļ E \ No newline at end of file diff --git a/nix/secrets/pyroscope_s3_secret.age b/nix/secrets/pyroscope_s3_secret.age index 7e59d24..c1b5174 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 86928bc..85cc371 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 3368ad9..23cd727 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/s3_mc_admin_client.age b/nix/secrets/s3_mc_admin_client.age index 2d40a5e..d51a700 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 246b464..9121984 100644 --- a/nix/secrets/secrets.nix +++ b/nix/secrets/secrets.nix @@ -2,7 +2,7 @@ let dns1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBKoyDczFntyQyWj47Z8JeewKcCobksd415WM1W56eS"; dns2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINZ1yLdDhI2Vou/9qrPIUP8RU8Sg0WxLI2njtP5hkdL7"; vps1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII4Xj3TsDPStoHquTfOlyxShbA/kgMfQskKN8jpfiY4R"; - vps2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID5s+zprxLgDhb6vxHgWjvzY8itKiWuKiX6QLGYo+OMu"; + vps2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKzt3OZAOG2sih8T9Bhoqg8ANBP5ZX60z0xmUW4cBWvX"; vps3 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHvupo7d9YMZw56qhjB+tZPijxiG1dKChLpkOWZN0Y7C"; vps4 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMpoLgBTWj1BcNxXVdM26jDBZl+BCtUTj20Wv4sZdCHz"; vps5 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBWbIznvWQSqRF1E9Gv9y7JXMy3LZxMAWj6K0Nq91kyZ"; diff --git a/nix/secrets/upload_files_s3_secret.age b/nix/secrets/upload_files_s3_secret.age index d5157e1..d836b16 100644 --- a/nix/secrets/upload_files_s3_secret.age +++ b/nix/secrets/upload_files_s3_secret.age @@ -1,6 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg I6nmoviH++5rpVKlC7WIp9WASGNFHF7y30wRXXPCbkU -kYZ+kcX51sJ5eawuOav1FeiVLMtEZL1wbgJvVjf2rhQ ---- 6IqMqLF0qr5eBn+fBz/mMi7KEn1uaaWNaqEfzQyO4V4 -<" |:Uǔ6 "&A+H.LT4^ UWB¨.v0<ȝJ켖`Mi(tnio: :o@i^u'dʟbf +oxGz6*E_ -"Eϴ}^C̈́r3t0Ef>mDx m Q$)QXlmk|,-qn9ʆ-)YlmDGl= UOITo fȣTa2# \ No newline at end of file +-> ssh-ed25519 qM6TYg 188H/PE0b8YiAgejIznCnBKRt9z4J0il43y3O0Nk2lQ +nu/Wbgn9dT/0TtiO+6bTUEu9F+ra/2rQKCfUK09JeN4 +--- 1YJ9Cg60UshpVEzIiqWerLqu8Bch++0Cw22tbtPJxS0 +2%W.9MS9e>Zvu1M~ͪ(<3w2(Zvl r[8R@1uu؉RĸY!_ZX +:r_ +8frJLq2sR6! *'彛Vk^>*ú.DN#s"O,JD`\i_-Kgi6 CD"u:"851X$~|f8% )tzBl:B4u@(bGCFH? \ No newline at end of file diff --git a/nix/secrets/wg_private_dns1.age b/nix/secrets/wg_private_dns1.age index eeb11f0..71d4c0c 100644 --- a/nix/secrets/wg_private_dns1.age +++ b/nix/secrets/wg_private_dns1.age @@ -1,6 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 LZU5Eg PttdTzbbxLbUw+V+mCZjRREsWuIHhGeVvIKkPCAkvQQ -3adTE4nRuPaMYo3wslgO2kND5dVYv5NOKYpi129kRrE ---- eKBS0RAp1BiY55dJ2vdJZdkJIA6wk/OA+JA2aTvLAFE -F]Y@JUM4914cbϓB9^.\™~ gkSGz - \ No newline at end of file +-> ssh-ed25519 LZU5Eg px1Nln+wkhpIG4xFeLEOhO3Dkknv+7GG9+JZdppLljg +zL60ZG9CHQrSnLfN+gd4kV9V3kBdiGOJ4t0DmkDI9FI +--- LIBuGo8IeBk/RyWcg1ordV6IR895iV05uz/P1iWx/+0 +%&>S&; + ssh-ed25519 5bWSnQ DUoRFPtsX8/bLSb71YEeJNfrDTwbxEEpXForZn8vXWQ -OYcq+6HnAHEb5mZfd7Pz9t/P3Yf6eKJVkJu90CXLXVw ---- PfDtwdOP8nTt+ZxIJSMA4uucVn+SMEOlvD8gRhOqyec -4֟U:C ssh-ed25519 5bWSnQ rj5NgCPBbNq/15YXa6DQXKwTU9Hpm7ocLiuINgLmhCQ +KOEgfF4MQopCZkzl2oi3obi/KBmykqzsCbHZQpC4rLY +--- +JacdysLbQkZq1H/lLD3oPzBi3orjxix5WYlv/lprHw +uT&^V[p6:W{kVޏ"j6҂n;^E$4BP`'FXQ }oiʸ] \ No newline at end of file diff --git a/nix/secrets/wg_private_vps1.age b/nix/secrets/wg_private_vps1.age index e24e248..44644d5 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 340cdad..8ad2191 100644 Binary files a/nix/secrets/wg_private_vps2.age and b/nix/secrets/wg_private_vps2.age differ diff --git a/nix/secrets/wg_private_vps3.age b/nix/secrets/wg_private_vps3.age index ca2fb19..7eb6f2b 100644 --- a/nix/secrets/wg_private_vps3.age +++ b/nix/secrets/wg_private_vps3.age @@ -1,6 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 XzACZQ 4f3Sm/Xpuu+lgnR+C5sLxrsADC4KjAwRCvb91zrPlg4 -Iok5RHD15fZmRWIay0nHzy1rtZjgt3Pbq23z6n6Zr78 ---- 4pu7oE7I2dV3Gd3r+cbezJWZULNS4n98B//0D+Vj55U -%3'=ڨ@x^-`[ -J_;WLEʨ@-SAyʛ euqzLQ \ No newline at end of file +-> ssh-ed25519 XzACZQ kJVyFsqcqh/THJgijrdhNFFelSpD2w4VGZEvNsQSwlM +DzC/l6rFyE9JF+IoA3pQv/3PihXnIlWQHje6++9rJsA +--- kRjNUG+4tPhNCcoAO47gwj04gmBXZXBPqgvH81KNn/E +#n>fa^!Č+sFB.u{I9NVϘixY .Je \ No newline at end of file diff --git a/nix/secrets/wg_private_vps4.age b/nix/secrets/wg_private_vps4.age index ca7a4a9..616c369 100644 Binary files a/nix/secrets/wg_private_vps4.age and b/nix/secrets/wg_private_vps4.age differ diff --git a/nix/secrets/wg_private_vps5.age b/nix/secrets/wg_private_vps5.age index 6d19556..84bb7a8 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 42dec43..c024b02 100644 Binary files a/nix/secrets/widetom_bot_token.age and b/nix/secrets/widetom_bot_token.age differ diff --git a/nix/secrets/widetom_config_toml.age b/nix/secrets/widetom_config_toml.age index 03983cd..84eafba 100644 Binary files a/nix/secrets/widetom_config_toml.age and b/nix/secrets/widetom_config_toml.age differ