From 0c80dde1d1294b090536199fcc373fd619f3cd9c Mon Sep 17 00:00:00 2001 From: Haonan Chen Date: Sat, 27 Dec 2025 11:40:10 +0800 Subject: [PATCH] packages/missgram: rename --- devices/vps6/default.nix | 2 +- devices/vps6/secrets.yaml | 12 +++---- flake/dev.nix | 4 +-- flake/dns/config/chn.moe.nix | 2 +- modules/services/misskey-forwarder.nix | 36 +++++++++---------- modules/user/default.nix | 2 +- packages/default.nix | 2 +- packages/missgram/.envrc | 1 + .../.gitignore | 0 .../CMakeLists.txt | 14 ++++---- .../default.nix | 4 +-- .../src/main.cpp | 6 ++-- packages/misskey-forwarder/.envrc | 1 - 13 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 packages/missgram/.envrc rename packages/{misskey-forwarder => missgram}/.gitignore (100%) rename packages/{misskey-forwarder => missgram}/CMakeLists.txt (61%) rename packages/{misskey-forwarder => missgram}/default.nix (59%) rename packages/{misskey-forwarder => missgram}/src/main.cpp (92%) delete mode 100644 packages/misskey-forwarder/.envrc diff --git a/devices/vps6/default.nix b/devices/vps6/default.nix index 5ab38ecb..73b0ac74 100644 --- a/devices/vps6/default.nix +++ b/devices/vps6/default.nix @@ -61,7 +61,7 @@ inputs: beesd."/" = {}; coredns.interface = "ens18"; headscale = {}; - misskey-forwarder = {}; + missgram = {}; }; }; networking.nftables.tables.forward = diff --git a/devices/vps6/secrets.yaml b/devices/vps6/secrets.yaml index 00713ef3..4f07e9ed 100644 --- a/devices/vps6/secrets.yaml +++ b/devices/vps6/secrets.yaml @@ -5,10 +5,10 @@ coturn: tinc: ENC[AES256_GCM,data:E3OrPA67R48x5FJUW0ZbERlclz8Z/XokAaGTeBQLPEHSeqEArHYSZkdJRZejFrBruJPlGZMPNBQzlIBXOfXKwMnlBDaGJIIJHIzPDGG9W7QF4IIRK/BjVZHFwfKvZtbUDGsqLcCSe5+ttmyucBaFGquXhnD/Tu09uyWtRvS10KAJLY0Z2/16CFB1+8egJIcYw2TFXObo+KR92Va0qwiDSepKaJtYLimDGRKk04QGj+BYa5y8PjIG6bz8UG82mmCiV7XM3EPlSMA=,iv:kawsklNGFbRhxKuUwvNL2WyBxuYu2T/uks1cJ4i8NhA=,tag:V+jAaxQX7JCiR5+wIVW4Nw==,type:str] postgresql: headscale: ENC[AES256_GCM,data:z2cyyT1TcIhNJCBeGn072aFI2nAioWZQvpyzoky4tWtMymKlw4ilOtSYAsp+kaNOoqvWSmoAQNJLNzeDk1iTCQ==,iv:hZdS/CAVBO0k/AmX3qw3YwTYgK49Aeu5QI3YCAduiZ0=,tag:2l4GPV/T2GHjAAUDX3LaEA==,type:str] -misskey-forwarder: - secret: ENC[AES256_GCM,data:MknbcYWGDptZ2PynMFyScA9Ka/KrtBPmMTgy/cSfXIw=,iv:fg2x6fjM/KhnC014UkNAYlHKWgMnamd+0bkjIELs04Y=,tag:H8azwIcxm9DMYQMWlWJQZw==,type:str] - telegramBotToken: ENC[AES256_GCM,data:Ba/De5aBmMSCE6Rucqy8uw7XyPSXgy+1c8tb1uJn27//+U0RrzEQnS6TcRy5rQ==,iv:pWIP626x5om98JxR49iHYUCf50IpJ1MKdi0Mml6+gQU=,tag:rpkQFqd7j+3lfAIzuRybMg==,type:str] - telegramChatId: ENC[AES256_GCM,data:HpwzLKbl1WykNj0uB0I=,iv:zA45v4ZNroZNCdoFntTeonwq+ulHpPey25WiuXGCGi4=,tag:yL6P2Vgv/LxTpDWSnZwTLg==,type:str] +missgram: + secret: ENC[AES256_GCM,data:qsxJue8mGAJejSxOoPd4MXD06upnk0fxUM5EKPBs/WI=,iv:HaHj/vJkIERUQ0Lr93s9kaApNWPjDcpLu2897qmCjqA=,tag:u73jUDd6pGKk1yir/oF4hQ==,type:str] + telegramBotToken: ENC[AES256_GCM,data:kNGhj1SjyK1H8NJmJLi90cpGtWmmGpFEFFT/JkDX4QqxbOC6BfFIMgzVsZ5GVQ==,iv:sccRmCs8HBAvi9mDAaz8OjxqXLAVXepJHaj7RrUt6kI=,tag:RuK3EdRMVhS9pVDw50lW6A==,type:str] + telegramChatId: ENC[AES256_GCM,data:Wy5PWg2nJgeL3zMquEk=,iv:FU9wl2eJzCH88lMLqRW6WX66h43Iw/jrdWsPwFbi7+Y=,tag:8OON6H1R6NWa+RqA/KxIrA==,type:str] sops: age: - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m @@ -29,7 +29,7 @@ sops: ZXFTU3ZCaW1pTVh0RUJzdDdGdHlPYTgK2mlgcX2kEc8+2UDdBnhUm6IIuh8V6agW ooxH9OEPXUVI/4JcDo4v8ZUhAyU1ehLH0Ef7PJCChOZe2KZmWSNbhA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-12-25T10:37:16Z" - mac: ENC[AES256_GCM,data:ffiDjDbD/BkzBt6zzly3vDtRbRSfpgGmRIjVarPvTuc/GLUPfUpDzibT27E7LI4aBK8Utt9CCip18zmtRKF4z4h4GfHrp0pb6PipyT43+bXqzmsBrCENDiJhiSYhc6VcpA1Xn18Ce8pMaIHkYrrABqtHxU9ML3NEy6vQgN4jim8=,iv:AnWInBNkjBteWhNPASwawH+6m9yopFnYFIh7dP1jVHo=,tag:6WBLuVOXrj1jOhOHUQ7cYA==,type:str] + lastmodified: "2025-12-27T03:38:11Z" + mac: ENC[AES256_GCM,data:/IM0SIc9BaGaVl3k5173R6Zz/Z87hexrAL4y0TGMNyvMy2ZrG2XJvr01XW+YbE9TPQxNZQDW9e6Xfn2jKoz+EUPEjSVEr2XC12ZUhwnEu9x99lmwvUrf8CwuXAfUIUN4hJvv7e5PsjaVkR1VAs/t6d5gYlqgX45oi8WMX6JQl/U=,iv:e8nzV4S/8F/5jcYlPwHyBBffutULS3kYOaIApv9MTBA=,tag:gt3g2pBPgfKv80kGYSb87A==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0 diff --git a/flake/dev.nix b/flake/dev.nix index eb4c9df4..f887fd68 100644 --- a/flake/dev.nix +++ b/flake/dev.nix @@ -55,9 +55,9 @@ CMAKE_EXPORT_COMPILE_COMMANDS = "1"; hardeningDisable = [ "all" ]; }; - misskey-forwarder = pkgs.mkShell.override { stdenv = pkgs.clang18Stdenv; } + missgram = pkgs.mkShell.override { stdenv = pkgs.clang18Stdenv; } { - inputsFrom = [ pkgs.localPackages.misskey-forwarder ]; + inputsFrom = [ pkgs.localPackages.missgram ]; packages = [ pkgs.llvmPackages_18.clang-tools ]; CMAKE_EXPORT_COMPILE_COMMANDS = "1"; hardeningDisable = [ "all" ]; diff --git a/flake/dns/config/chn.moe.nix b/flake/dns/config/chn.moe.nix index 69ac66d4..affb056e 100644 --- a/flake/dns/config/chn.moe.nix +++ b/flake/dns/config/chn.moe.nix @@ -8,7 +8,7 @@ let vps6 = [ "blog" "catalog" "coturn" "element" "initrd.vps6" "sticker" "synapse-admin" "tgapi" "ua" "xserver2" - "xserver2.vps6" "s" "headscale" "misskey-forwarder" + "xserver2.vps6" "s" "headscale" "missgram" # to pc "铜锣湾实验室" ]; diff --git a/modules/services/misskey-forwarder.nix b/modules/services/misskey-forwarder.nix index 734f68f8..985bbb4f 100644 --- a/modules/services/misskey-forwarder.nix +++ b/modules/services/misskey-forwarder.nix @@ -1,52 +1,52 @@ inputs: { - options.nixos.services.misskey-forwarder = let inherit (inputs.lib) mkOption types; in mkOption + options.nixos.services.missgram = let inherit (inputs.lib) mkOption types; in mkOption { type = types.nullOr (types.submodule {}); default = null; }; - config = let inherit (inputs.config.nixos.services) misskey-forwarder; in inputs.lib.mkIf (misskey-forwarder != null) + config = let inherit (inputs.config.nixos.services) missgram; in inputs.lib.mkIf (missgram != null) { users = { - users.misskey-forwarder = - { uid = inputs.config.nixos.user.uid.misskey-forwarder; group = "misskey-forwarder"; isSystemUser = true; }; - groups.misskey-forwarder.gid = inputs.config.nixos.user.gid.misskey-forwarder; + users.missgram = + { uid = inputs.config.nixos.user.uid.missgram; group = "missgram"; isSystemUser = true; }; + groups.missgram.gid = inputs.config.nixos.user.gid.missgram; }; systemd = { - services.misskey-forwarder = + services.missgram = { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - User = inputs.config.users.users.misskey-forwarder.name; - Group = inputs.config.users.users.misskey-forwarder.group; + User = inputs.config.users.users.missgram.name; + Group = inputs.config.users.users.missgram.group; ExecStart = - let forwarder = inputs.pkgs.localPackages.misskey-forwarder.override - { configFile = inputs.config.nixos.system.sops.templates."misskey-forwarder/config.yml".path; }; - in "${forwarder}/bin/misskey-forwarder"; + let forwarder = inputs.pkgs.localPackages.missgram.override + { configFile = inputs.config.nixos.system.sops.templates."missgram/config.yml".path; }; + in "${forwarder}/bin/missgram"; }; }; }; nixos = { - services.nginx.https."misskey-forwarder.chn.moe".location."/".proxy.upstream = "http://127.0.0.1:9173"; + services.nginx.https."missgram.chn.moe".location."/".proxy.upstream = "http://127.0.0.1:9173"; system.sops = { - templates."misskey-forwarder/config.yml" = + templates."missgram/config.yml" = { - owner = "misskey-forwarder"; + owner = "missgram"; content = let inherit (inputs.config.nixos.system.sops) placeholder; in builtins.toJSON { - Secret = placeholder."misskey-forwarder/secret"; - TelegramBotToken = placeholder."misskey-forwarder/telegramBotToken"; - TelegramChatId = placeholder."misskey-forwarder/telegramChatId"; + Secret = placeholder."missgram/secret"; + TelegramBotToken = placeholder."missgram/telegramBotToken"; + TelegramChatId = placeholder."missgram/telegramChatId"; ServerPort = 9173; }; }; secrets = inputs.lib.genAttrs' [ "secret" "telegramBotToken" "telegramChatId" ] - (n: inputs.lib.nameValuePair "misskey-forwarder/${n}" {}); + (n: inputs.lib.nameValuePair "missgram/${n}" {}); }; }; }; diff --git a/modules/user/default.nix b/modules/user/default.nix index 81e007cb..ea7c007b 100644 --- a/modules/user/default.nix +++ b/modules/user/default.nix @@ -56,7 +56,7 @@ inputs: hpcstat = 2011; speedtest = 2012; tailscale = 2013; - misskey-forwarder = 2014; + missgram = 2014; }; }; gid = mkOption diff --git a/packages/default.nix b/packages/default.nix index 5c40ad97..1eee4aea 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -144,7 +144,7 @@ inputs: rec buildProxy = inputs.pkgs.lib.mkBuildproxy ./pybinding/proxy.nix; }; brokenaxes = inputs.pkgs.python3Packages.callPackage ./brokenaxes.nix { src = inputs.topInputs.brokenaxes; }; - misskey-forwarder = inputs.pkgs.callPackage ./misskey-forwarder { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; + missgram = inputs.pkgs.callPackage ./missgram { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; fromYaml = content: builtins.fromJSON (builtins.readFile (inputs.pkgs.runCommand "toJSON" {} diff --git a/packages/missgram/.envrc b/packages/missgram/.envrc new file mode 100644 index 00000000..4a07793b --- /dev/null +++ b/packages/missgram/.envrc @@ -0,0 +1 @@ +use flake .#missgram diff --git a/packages/misskey-forwarder/.gitignore b/packages/missgram/.gitignore similarity index 100% rename from packages/misskey-forwarder/.gitignore rename to packages/missgram/.gitignore diff --git a/packages/misskey-forwarder/CMakeLists.txt b/packages/missgram/CMakeLists.txt similarity index 61% rename from packages/misskey-forwarder/CMakeLists.txt rename to packages/missgram/CMakeLists.txt index 0b08a42f..c0f7f906 100644 --- a/packages/misskey-forwarder/CMakeLists.txt +++ b/packages/missgram/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(misskey-forwarder VERSION 0.0.0 LANGUAGES CXX) +project(missgram VERSION 0.0.0 LANGUAGES CXX) enable_testing() include(GNUInstallDirs) @@ -12,13 +12,13 @@ endif() find_package(biu REQUIRED) find_package(httplib REQUIRED) -add_executable(misskey-forwarder src/main.cpp) -target_link_libraries(misskey-forwarder PRIVATE biu::biu httplib::httplib) -target_compile_features(misskey-forwarder PRIVATE cxx_std_23) -if(DEFINED FORWARDER_CONFIG_FILE) - target_compile_definitions(misskey-forwarder PRIVATE FORWARDER_CONFIG_FILE="${FORWARDER_CONFIG_FILE}") +add_executable(missgram src/main.cpp) +target_link_libraries(missgram PRIVATE biu::biu httplib::httplib) +target_compile_features(missgram PRIVATE cxx_std_23) +if(DEFINED MISSGRAM_CONFIG_FILE) + target_compile_definitions(missgram PRIVATE MISSGRAM_CONFIG_FILE="${MISSGRAM_CONFIG_FILE}") endif() -install(TARGETS misskey-forwarder RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(TARGETS missgram RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) get_property(ImportedTargets DIRECTORY "${CMAKE_SOURCE_DIR}" PROPERTY IMPORTED_TARGETS) message("Imported targets: ${ImportedTargets}") diff --git a/packages/misskey-forwarder/default.nix b/packages/missgram/default.nix similarity index 59% rename from packages/misskey-forwarder/default.nix rename to packages/missgram/default.nix index a15f50d4..f386c08a 100644 --- a/packages/misskey-forwarder/default.nix +++ b/packages/missgram/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, cmake, pkg-config, biu, configFile ? null, httplib }: stdenv.mkDerivation { - name = "misskey-forwarder"; + name = "missgram"; src = ./.; buildInputs = [ biu httplib ]; nativeBuildInputs = [ cmake pkg-config ]; - cmakeFlags = lib.optional (configFile != null) [ "-DFORWARDER_CONFIG_FILE=${configFile}" ]; + cmakeFlags = lib.optional (configFile != null) [ "-DMISSGRAM_CONFIG_FILE=${configFile}" ]; } diff --git a/packages/misskey-forwarder/src/main.cpp b/packages/missgram/src/main.cpp similarity index 92% rename from packages/misskey-forwarder/src/main.cpp rename to packages/missgram/src/main.cpp index 674f1068..2d4aeb93 100644 --- a/packages/misskey-forwarder/src/main.cpp +++ b/packages/missgram/src/main.cpp @@ -1,8 +1,8 @@ # include # include # include -# ifndef FORWARDER_CONFIG_FILE -# define FORWARDER_CONFIG_FILE "./config.yaml" +# ifndef MISSGRAM_CONFIG_FILE +# define MISSGRAM_CONFIG_FILE "./config.yaml" # endif int main() @@ -16,7 +16,7 @@ int main() std::string TelegramBotToken; std::string TelegramChatId; int ServerPort; - } config = YAML::LoadFile(FORWARDER_CONFIG_FILE).as(); + } config = YAML::LoadFile(MISSGRAM_CONFIG_FILE).as(); biu::Logger::try_exec([&] { diff --git a/packages/misskey-forwarder/.envrc b/packages/misskey-forwarder/.envrc deleted file mode 100644 index 7fbecefe..00000000 --- a/packages/misskey-forwarder/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake .#misskey-forwarder