diff --git a/secrets/bread-dcbot.age b/secrets/bread-dcbot.age deleted file mode 100644 index 81ae673..0000000 --- a/secrets/bread-dcbot.age +++ /dev/null @@ -1,16 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 GQzYWA oxKOXLokaA47vSPUhCobKZnSJSmTXY5HFbOm72XcLho -RhWCfWMIgacKpR0Yy9m7PN+e0aUx2qp73YQKoMsvq7Y --> ssh-ed25519 MfR7VA mUCKaE6KtLwEqx1HUJLCdwLCLE/JmbrsluWFCNnE0zc -XW8ixc5VPYSiBvtFtOG1SIayrmR7smu0Y+WSChqIrOI --> ssh-ed25519 +cvRTg Z5EeXPZ4uK9qpTn3X9QkNgmqVSScY+5SNyW1ff+a9WI -QTgv8WV+pM32OeAR7IdAIeqdYSyjGRz3DiOT+hP7qzc --> ssh-ed25519 WCPLrA 6d7Tu27YChuazPy+A1a58nLCIIIK7aFimMSCW18Wahg -4XaJsMe97L0y3TH6ytrHa8YJIIXQMPV60Omp6RaepPs --> ssh-ed25519 7/ziYw 7L1sXK+Cd2hLne2Vdr0dslWgmZJH0gRWlSPyxDxy8Ro -reoZzk6rUDLwIUXIz2mlIwRsEJoJp0KGmdZNXVN7/VQ --> ssh-ed25519 VQy60Q n1Yq+hoUwjirJusbHSXhAlJDQFE8hLwouFfh8bPcTUc -YRVEgRbG2lEJ5pz6V1owgQ5etWnh81zwunUvQRzegQM ---- az5zrd8PDMTJJW//qtDTp1qw0M0ePTBZwYRnD4UJgxs -fЦ0"=k -fbPJJcR}sP ׶afL* ;U ]yw:̞Ū%A,oFTM -V{\i]6alg26l2ϞN> sq2U#0A,pxYgR{ЍVSI~Y ^P(? 7D466EuQٍzrm_9f1&y;/>2쫗l>+N5Lo \hצ4630? \ No newline at end of file diff --git a/secrets/default.nix b/secrets/default.nix index 99356d8..12e4986 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -13,13 +13,6 @@ in { then serviceUser "dcbot" # "dcbot" doesn't exist on e.g laptop. else "root"; }; - bread-dcbot = { - file = ./bread-dcbot.age; - owner = - if config.niksos.server - then serviceUser "bread-dcbot" # "dcbot" doesn't exist on e.g laptop. - else "root"; - }; password.file = ./password.age; matrix-registration = { file = ./matrix-registration.age; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 2db3699..190ca21 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -16,7 +16,6 @@ in { "transfer-sh.age".publicKeys = keys; "password.age".publicKeys = keys; "dcbot.age".publicKeys = keys; - "bread-dcbot.age".publicKeys = keys; "matrix-registration.age".publicKeys = keys; "cloudflare-acme.age".publicKeys = keys; "mail-admin.age".publicKeys = keys; diff --git a/system/server/default.nix b/system/server/default.nix index 001c25f..1c23bb6 100644 --- a/system/server/default.nix +++ b/system/server/default.nix @@ -1,15 +1,4 @@ {lib, ...}: { - imports = [ - ./bot.nix - ./caddy.nix - ./derekBot.nix - ./forgejo.nix - ./immich.nix - ./index - ./mail.nix - ./matrix.nix - ./seafile.nix - ./temp.nix - ]; + imports = [./caddy.nix ./index ./seafile.nix ./bot.nix ./immich.nix ./matrix.nix ./mail.nix ./forgejo.nix ./temp.nix]; options.niksos.server = lib.mkEnableOption "server servcies (such as caddy)."; #TODO: per service option. } diff --git a/system/server/derekBot.nix b/system/server/derekBot.nix deleted file mode 100644 index 4c5791f..0000000 --- a/system/server/derekBot.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - cfg = config.niksos.server; - userGroup = "bread-dcbot"; - gitRepo = "https://github.com/The-Breadening/Breadener"; - - bash = lib.getExe pkgs.bash; - varLib = "/var/lib/"; - mainDir = - varLib - + ( - if !cfg - then "" - else userGroup - ) - + "/"; - programDir = mainDir + "program"; - denoDir = mainDir + "deno"; - tokenDir = mainDir + "Breadener-token"; - path = builtins.concatStringsSep ":" (map (x: "${x}/bin/") [pkgs.coreutils pkgs.deno pkgs.git]); -in { - config = lib.mkIf config.niksos.server { - systemd.services.${userGroup} = { - enable = true; - after = ["network.target"]; - wantedBy = ["default.target"]; - description = userGroup; - - environment = { - "DENO_DIR" = denoDir; - "PATH" = lib.mkForce path; - }; - - preStart = '' - export PATH=${path} - - cd "${mainDir}" - chown -R ${userGroup}:${userGroup} ${mainDir}* || echo - - rm -rf "${tokenDir}" || echo - mkdir -p "${denoDir}" "${tokenDir}" - ln -s "${config.age.secrets.${userGroup}.path}" "${tokenDir}/prodBot.json" - - if [ ! -d "${programDir}" ]; then - git clone "${gitRepo}" "${programDir}" - fi - chmod -R 750 ${mainDir}* || echo - - - cd "${programDir}" - git fetch - git reset --hard HEAD - - DENO_DIR=${denoDir} deno i - ''; - - serviceConfig = { - StateDirectory = userGroup; - ExecStart = "${bash} -c 'cd ${programDir} && deno run prod'"; - User = userGroup; - Group = userGroup; - Restart = "always"; - RuntimeMaxSec = 6 * 60 * 60; # 6h * 60min * 60s - }; - }; - - users.groups.${userGroup} = {}; - users.users.${userGroup} = { - group = userGroup; - isSystemUser = true; - }; - }; -}