diff --git a/nix/apps/hugo-chat/default.nix b/nix/apps/hugo-chat/default.nix index 9f78f6b..17d3a26 100644 --- a/nix/apps/hugo-chat/default.nix +++ b/nix/apps/hugo-chat/default.nix @@ -1,32 +1,36 @@ { config, lib, pkgs, ... }: let - jarfile = pkgs.fetchurl { - url = - "https://github.com/C0RR1T/HugoChat/releases/download/2024-08-05/HugoServer.jar"; - hash = "sha256-hCe2UPqrSR6u3/UxsURI2KzRxN5saeTteCRq5Zfay4M="; + dockerLogin = { + registry = "docker.noratrieb.dev"; + username = "nils"; + passwordFile = config.age.secrets.docker_registry_password.path; }; in { age.secrets.hugochat_db_password.file = ../../secrets/hugochat_db_password.age; - systemd.services.hugo-chat-server = { - description = "HugoChat server, a chat platform"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - environment = { - SPRING_DATASOURCE_URL = "jdbc:postgresql://localhost:5003/postgres"; - }; - serviceConfig = { - DynamicUser = true; - ExecStart = "${lib.getExe' pkgs.jdk21 "java"} -jar ${jarfile} --server.port=5001"; - EnvironmentFile = [ config.age.secrets.hugochat_db_password.path ]; - }; - }; - virtualisation.oci-containers.containers = { + hugo-chat-client = { + image = "docker.noratrieb.dev/hugo-chat-client:89ce0b07"; + login = dockerLogin; + ports = [ "127.0.0.1:5002:80" ]; + }; + + hugo-chat-server = { + image = "docker.noratrieb.dev/hugo-chat-server:89ce0b07"; + ports = [ "127.0.0.1:5001:8080" ]; + environment = { + SPRING_DATASOURCE_URL = "jdbc:postgresql://hugo-chat-db:5432/postgres"; + }; + environmentFiles = [ config.age.secrets.hugochat_db_password.path ]; + extraOptions = [ "--network=hugo-chat" ]; + + dependsOn = [ "hugo-chat-db" ]; + login = dockerLogin; + }; + hugo-chat-db = { image = "postgres:16"; - ports = [ "127.0.0.1:5003:5432" ]; volumes = [ "/var/lib/hugo-chat/data:/var/lib/postgresql/data" ]; environment = { PGDATA = "/var/lib/postgresql/data/pgdata"; diff --git a/nix/modules/caddy/default.nix b/nix/modules/caddy/default.nix index c2f132f..0116fa0 100644 --- a/nix/modules/caddy/default.nix +++ b/nix/modules/caddy/default.nix @@ -15,11 +15,6 @@ let blog = fetchTarball "https://github.com/Noratrieb/blog/archive/${my-projects-versions.blog}.tar.gz"; slides = fetchTarball "https://github.com/Noratrieb/slides/archive/${my-projects-versions.slides}.tar.gz"; website-build = website { inherit pkgs slides blog; }; - hugo-chat-client = fetchTarball { - url = - "https://github.com/C0RR1T/HugoChat/releases/download/2024-08-05/hugo-client.tar.xz"; - sha256 = "sha256:121ai8q6bm7gp0pl1ajfk0k2nrfg05zid61i20z0j5gpb2qyhsib"; - }; in { environment.systemPackages = [ caddy ]; @@ -89,23 +84,6 @@ in '' else "" } - ${if name == "vps1" then '' - hugo-chat.noratrieb.dev { - log - encode zstd gzip - root * ${import ./caddy-static-prepare { - name = "hugo-chat-client"; - src = hugo-chat-client; - inherit pkgs lib; - }} - try_files {path} /index.html - file_server { - etag_file_extensions .sha256 - precompressed zstd gzip br - } - } - '' else ""} - ${ if name == "vps1" || name == "vps3" || name == "vps4" then builtins.readFile ./${name}.Caddyfile else "" diff --git a/nix/modules/caddy/vps1.Caddyfile b/nix/modules/caddy/vps1.Caddyfile index 11712b2..4b3c58f 100644 --- a/nix/modules/caddy/vps1.Caddyfile +++ b/nix/modules/caddy/vps1.Caddyfile @@ -3,6 +3,12 @@ www.noratrieb.dev { redir https://noratrieb.dev{uri} permanent } +hugo-chat.noratrieb.dev { + log + encode zstd gzip + reverse_proxy * localhost:5002 +} + api.hugo-chat.noratrieb.dev { log import cors https://hugo-chat.noratrieb.dev "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type" diff --git a/nix/modules/default/default.nix b/nix/modules/default/default.nix index a1169a0..9acbd60 100644 --- a/nix/modules/default/default.nix +++ b/nix/modules/default/default.nix @@ -179,51 +179,5 @@ in }; }; - services.alloy = { - enable = true; - }; - systemd.services.alloy.serviceConfig = { - DynamicUser = lib.mkForce false; - }; - environment.etc."alloy/config.alloy".text = '' - discovery.process "all" { - discover_config { - cgroup_path = true - container_id = true - } - } - - discovery.relabel "alloy" { - targets = discovery.process.all.targets - // Filter needed processes - rule { - source_labels = ["__meta_process_cgroup_path"] - regex = "0::/system.slice/.*.service" - action = "keep" - } - - rule { - source_labels = ["__meta_process_cgroup_path"] - regex = "0::/system.slice/(.*.service)" - target_label = "service_name" - action = "replace" - } - } - - pyroscope.ebpf "instance" { - forward_to = [pyroscope.write.endpoint.receiver] - targets = discovery.relabel.alloy.output - } - - pyroscope.write "endpoint" { - endpoint { - url = "http://vps3.local:4040" - } - external_labels = { - "instance" = env("HOSTNAME"), - } - } - ''; - deployment.tags = networkingConfig."${name}".tags; } diff --git a/nix/modules/prometheus/default.nix b/nix/modules/prometheus/default.nix index a1af908..b1e06da 100644 --- a/nix/modules/prometheus/default.nix +++ b/nix/modules/prometheus/default.nix @@ -1,4 +1,4 @@ -{ config, lib, networkingConfig, pkgs, ... }: { +{ config, lib, networkingConfig, ... }: { services.prometheus = { enable = true; globalConfig = { }; @@ -83,21 +83,12 @@ access = "proxy"; url = "http://vps3.local:3100"; } - { - name = "pyroscope"; - type = "grafana-pyroscope-datasource"; - access = "proxy"; - url = "http://vps3.local:4040"; - } ]; }; }; }; - networking.firewall.interfaces.wg0.allowedTCPPorts = [ - config.services.loki.configuration.server.http_listen_port - 4040 # pyroscope - ]; + networking.firewall.interfaces.wg0.allowedTCPPorts = [ config.services.loki.configuration.server.http_listen_port ]; age.secrets.loki_env.file = ../../secrets/loki_env.age; systemd.services.loki.serviceConfig.EnvironmentFile = config.age.secrets.loki_env.path; services.loki = { @@ -151,56 +142,4 @@ mkdir -p /var/lib/loki/{index,cache} chown ${config.services.loki.user}:${config.services.loki.group} -R /var/lib/loki ''; - - - age.secrets.pyroscope_s3_secret = { - file = ../../secrets/pyroscope_s3_secret.age; - owner = config.users.users.pyroscope.name; - }; - - systemd.services.pyroscope = - let - pyroscope = builtins.fetchTarball { - url = "https://github.com/grafana/pyroscope/releases/download/v1.14.0/pyroscope_1.14.0_linux_amd64.tar.gz"; - sha256 = "sha256:005539bp2a2kac8ff6vz77g0niav81rggha1bsfx454fw4dyli4y"; - }; - pyroscopeConfig = { - analytics.reporting_enabled = false; - server = { - grpc_listen_port = 9084; # random port - }; - storage = { - backend = "s3"; - s3 = { - bucket_name = "pyroscope"; - region = "garage"; - endpoint = "localhost:3900"; - insecure = true; - access_key_id = "\${ACCESS_KEY_ID}"; - secret_access_key = "\${ACCESS_SECRET_KEY}"; - }; - }; - }; - in - { - description = "pyroscope, the continuous profiling database"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - Restart = "always"; - User = config.users.users.pyroscope.name; - Group = config.users.users.pyroscope.group; - ExecStart = "${pyroscope}/pyroscope -config.expand-env=true -config.file ${pkgs.writeText "config.yml" (builtins.toJSON pyroscopeConfig)}"; - EnvironmentFile = config.age.secrets.pyroscope_s3_secret.path; - WorkingDirectory = "/var/lib/pyroscope"; - }; - }; - - users.users.pyroscope = { - group = "pyroscope"; - isSystemUser = true; - home = "/var/lib/pyroscope"; - createHome = true; - }; - users.groups.pyroscope = { }; } diff --git a/nix/secrets/backup_s3_secret.age b/nix/secrets/backup_s3_secret.age index 66ab603..4ef1361 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 9eb6b5a..39bb560 100644 Binary files a/nix/secrets/caddy_s3_key_secret.age and b/nix/secrets/caddy_s3_key_secret.age differ diff --git a/nix/secrets/docker_registry_password.age b/nix/secrets/docker_registry_password.age index 51d82f7..13f02ef 100644 --- a/nix/secrets/docker_registry_password.age +++ b/nix/secrets/docker_registry_password.age @@ -1,6 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg EuWuwScs5A1DFpXrWif52YGxrscegIPGS7ZpoVS+7QI -NsTXnjIRz7G8oNAS9MLRPkDSS7LNogLBK9hJBaC3qXE ---- 4dEpELTzVN+A2cdD25L0A1iU8YKoB+249GEn1lxZzU8 -ũ(';C5QOജ\]W('NZ?2f^iBcҽ - \ 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/nix/secrets/forgejo_s3_key_secret.age b/nix/secrets/forgejo_s3_key_secret.age index 26900b7..2c66a3a 100644 --- a/nix/secrets/forgejo_s3_key_secret.age +++ b/nix/secrets/forgejo_s3_key_secret.age @@ -1,5 +1,7 @@ age-encryption.org/v1 --> 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 +-> 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/nix/secrets/garage_secrets.age b/nix/secrets/garage_secrets.age index bae6281..af23541 100644 --- a/nix/secrets/garage_secrets.age +++ b/nix/secrets/garage_secrets.age @@ -1,13 +1,13 @@ age-encryption.org/v1 --> 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 +-> 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/nix/secrets/grafana_admin_password.age b/nix/secrets/grafana_admin_password.age index 4c1ac47..2d2fac7 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 f0e0305..3e48ca0 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 61fe20e..d9e3d98 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 980ab1f..010ee28 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 a1b8f24..daf2e33 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 208e397..f202cc0 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 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 +-> ssh-ed25519 qM6TYg 0lWcSdSricBNu8i0oMnNe0gOsoDrY9DfPvmCIS63ohc +fY0M+k7xXU5nlLTSbJQF7iDevujQVxZ2lLca9CiBTaI +--- 5ObZSaeWsTlkqKq5D8vWKsrY8WCku2ndSlrjBKRtQE8 +Iye$Q|h'Q1Q1CހmQ:Q.SE=cm @-9j7fǺFT"o"|0DΒ,Wŋm*̬~5'{ jluuy+ \ No newline at end of file diff --git a/nix/secrets/pyroscope_s3_secret.age b/nix/secrets/pyroscope_s3_secret.age deleted file mode 100644 index c1b5174..0000000 Binary files a/nix/secrets/pyroscope_s3_secret.age and /dev/null differ diff --git a/nix/secrets/registry_htpasswd.age b/nix/secrets/registry_htpasswd.age index 85cc371..9d1e5fd 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 23cd727..eee2e12 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 d51a700..2cc8862 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 9121984..456c560 100644 --- a/nix/secrets/secrets.nix +++ b/nix/secrets/secrets.nix @@ -25,7 +25,6 @@ in "killua_env.age".publicKeys = [ vps1 ]; "forgejo_s3_key_secret.age".publicKeys = [ vps1 ]; "upload_files_s3_secret.age".publicKeys = [ vps1 ]; - "pyroscope_s3_secret.age".publicKeys = [ vps3 ]; "wg_private_dns1.age".publicKeys = [ dns1 ]; "wg_private_dns2.age".publicKeys = [ dns2 ]; "wg_private_vps1.age".publicKeys = [ vps1 ]; diff --git a/nix/secrets/upload_files_s3_secret.age b/nix/secrets/upload_files_s3_secret.age index d836b16..01042a4 100644 --- a/nix/secrets/upload_files_s3_secret.age +++ b/nix/secrets/upload_files_s3_secret.age @@ -1,7 +1,5 @@ age-encryption.org/v1 --> 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 +-> ssh-ed25519 qM6TYg Tq8qyikECRKhPhMbKFDd+YZIGkx9uj3vOWk7QRHEkn8 +wDbkM7KZWGDF3mECEa1MPPTC5F7uxe8nGtIZZkVCWU0 +--- hpRMWveZaPAIS44Jr6rRGHMOQfRi7nFpN0nxHU6fPOQ +t4`:,PʍN?ij\ȱ雵uAH_?Pg# T+R-ȺX,!YeZFmd\4bDAkLk1Rz6xo(8gzV+s|.T;OM6 zAQV~mNXI qkt#JyrSu?ږN Ոb!Ksy, AyfW##"`nPX,$z1 (P "y|sTxBFtl!6ۉ0os*.H/o5ۭl \ No newline at end of file diff --git a/nix/secrets/wg_private_dns1.age b/nix/secrets/wg_private_dns1.age index 71d4c0c..e9a0be3 100644 --- a/nix/secrets/wg_private_dns1.age +++ b/nix/secrets/wg_private_dns1.age @@ -1,6 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 LZU5Eg px1Nln+wkhpIG4xFeLEOhO3Dkknv+7GG9+JZdppLljg -zL60ZG9CHQrSnLfN+gd4kV9V3kBdiGOJ4t0DmkDI9FI ---- LIBuGo8IeBk/RyWcg1ordV6IR895iV05uz/P1iWx/+0 -%&>S&; - 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/nix/secrets/wg_private_dns2.age b/nix/secrets/wg_private_dns2.age index d23bc4d..d986ea6 100644 --- a/nix/secrets/wg_private_dns2.age +++ b/nix/secrets/wg_private_dns2.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> 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 +-> 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/nix/secrets/wg_private_vps1.age b/nix/secrets/wg_private_vps1.age index 44644d5..089fc55 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 8ad2191..a92b028 100644 --- a/nix/secrets/wg_private_vps2.age +++ b/nix/secrets/wg_private_vps2.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 pP9cdg HiT/+dwaX8i9h5SeKF8AmEWQHFNs6nmyO089M/1Rjxo -RjSM4+UBIrM+G9eckuH8+0Te9mhs3zXENPoFGJcHtAQ ---- nDLsXpiyO2KyB/KDgO288tCfyvL8eCDhESLaRqBNlVg -ZۡqbBGAH*_c0`p*XY8NGĜ5IXمƗh,Q*FR% \ No newline at end of file +-> 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/nix/secrets/wg_private_vps3.age b/nix/secrets/wg_private_vps3.age index 7eb6f2b..2536ac0 100644 --- a/nix/secrets/wg_private_vps3.age +++ b/nix/secrets/wg_private_vps3.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> 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 +-> 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/nix/secrets/wg_private_vps4.age b/nix/secrets/wg_private_vps4.age index 616c369..ca2ab16 100644 --- a/nix/secrets/wg_private_vps4.age +++ b/nix/secrets/wg_private_vps4.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 51bcvA bcFC2L95dfbs7WLewqcQeH62fgba42DbYrFu126AWFg -vfS/79EjlhWxp4cdOJv0WRWp8BIGefIvkNHrr5wcC7Y ---- F8/9B/N6d0SjEHRHuiuCsqRGgRr2XoZdFRT1UKbi7+0 -9lx"uVW#IEsj89 dDkTgʴ?<25q' )yւm} \ 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/nix/secrets/wg_private_vps5.age b/nix/secrets/wg_private_vps5.age index 84bb7a8..fa70bad 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 c024b02..d3d06bf 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 84eafba..aa4e0f9 100644 Binary files a/nix/secrets/widetom_config_toml.age and b/nix/secrets/widetom_config_toml.age differ diff --git a/secrets-git-crypt/pyroscope_s3_secret b/secrets-git-crypt/pyroscope_s3_secret deleted file mode 100644 index 0d51de8..0000000 Binary files a/secrets-git-crypt/pyroscope_s3_secret and /dev/null differ