From 4a489e90f3af8d6eeb0ab0658c6e932253eaedc3 Mon Sep 17 00:00:00 2001 From: Yisroel Baum Date: Sat, 1 Aug 2026 22:15:52 +0300 Subject: [PATCH] remove Rabbi Gerzi ownership --- README.md | 3 --- flake.lock | 55 -------------------------------------------- flake.nix | 12 +--------- nix/module.nix | 20 ---------------- nix/tests/module.nix | 8 ------- 5 files changed, 1 insertion(+), 97 deletions(-) diff --git a/README.md b/README.md index 3855902..b5581e9 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,6 @@ This flake owns the production NixOS configuration for the web services under - the MyResume package at `yisroelbaum.com`; - Jellyfin at `jellyfin.yisroelbaum.com`; - Forgejo at `git.yisroelbaum.com`, including its Borg backup; -- Rabbi Gerzi at `rabbigerzi.yisroelbaum.com` and - `rabbigerziapi.yisroelbaum.com`; - nginx and per-host ACME certificates for those endpoints. The importing host remains responsible for provisioning secrets. Import @@ -22,7 +20,6 @@ services.yisroelbaum-web = { borgPrivateKey = "/run/secrets/borg-private-key"; forgejoMailerUser = "/run/secrets/forgejo-mailer-user"; forgejoMailerPassword = "/run/secrets/forgejo-mailer-password"; - rabbiGerziEnvironment = "/run/secrets/rabbi-gerzi.env"; }; }; ``` diff --git a/flake.lock b/flake.lock index 2b70b95..4083152 100644 --- a/flake.lock +++ b/flake.lock @@ -16,27 +16,6 @@ "type": "github" } }, - "rabbi-gerzi": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1783365146, - "narHash": "sha256-glQYGvVU2renata14CZqKmAINrbZqVud/BBqimr4QHM=", - "ref": "refs/heads/master", - "rev": "04aad89124c4d4c6347fd741f76ca163941292b9", - "revCount": 375, - "type": "git", - "url": "https://git.yisroelbaum.com/yisroelbaum/Rabbi_Gerzi" - }, - "original": { - "type": "git", - "url": "https://git.yisroelbaum.com/yisroelbaum/Rabbi_Gerzi" - } - }, "resume": { "inputs": { "nixpkgs": [ @@ -60,42 +39,8 @@ "root": { "inputs": { "nixpkgs": "nixpkgs", - "rabbi-gerzi": "rabbi-gerzi", "resume": "resume" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c5b2a35..fcd1d5b 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - rabbi-gerzi = { - url = "git+https://git.yisroelbaum.com/yisroelbaum/Rabbi_Gerzi"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = @@ -20,7 +16,6 @@ self, nixpkgs, resume, - rabbi-gerzi, ... }: let @@ -29,12 +24,7 @@ module = import ./nix/module.nix { inherit resume; }; in { - nixosModules.yisroelbaum-web = { - imports = [ - rabbi-gerzi.nixosModules.default - module - ]; - }; + nixosModules.yisroelbaum-web = module; nixosModules.default = self.nixosModules.yisroelbaum-web; checks.${system}.module-eval = import ./nix/tests/module.nix { diff --git a/nix/module.nix b/nix/module.nix index 7a0e404..162577a 100644 --- a/nix/module.nix +++ b/nix/module.nix @@ -25,7 +25,6 @@ in borgPrivateKey = secretFileOption "Borg repository SSH private key file."; forgejoMailerUser = secretFileOption "Forgejo SMTP username file."; forgejoMailerPassword = secretFileOption "Forgejo SMTP password file."; - rabbiGerziEnvironment = secretFileOption "Rabbi Gerzi runtime dotenv file."; }; }; @@ -62,25 +61,6 @@ in }; }; - rabbi-gerzi = { - enable = true; - frontend = { - hostName = "rabbigerzi.${domainName}"; - nginx = { - forceSSL = true; - enableACME = true; - }; - }; - backend = { - hostName = "rabbigerziapi.${domainName}"; - environmentFile = cfg.secretFiles.rabbiGerziEnvironment; - nginx = { - forceSSL = true; - enableACME = true; - }; - }; - }; - nginx = { enable = true; virtualHosts = { diff --git a/nix/tests/module.nix b/nix/tests/module.nix index 25695c2..2e7fba9 100644 --- a/nix/tests/module.nix +++ b/nix/tests/module.nix @@ -18,7 +18,6 @@ let borgPrivateKey = "/run/secrets/borg-private-key"; forgejoMailerUser = "/run/secrets/forgejo-mailer-user"; forgejoMailerPassword = "/run/secrets/forgejo-mailer-password"; - rabbiGerziEnvironment = "/run/secrets/rabbi-gerzi.env"; }; }; } @@ -33,14 +32,11 @@ let "yisroelbaum.com" "jellyfin.yisroelbaum.com" "git.yisroelbaum.com" - "rabbigerzi.yisroelbaum.com" - "rabbigerziapi.yisroelbaum.com" ]; in assert evaluatedConfig.services.nginx.enable; assert evaluatedConfig.services.jellyfin.enable; assert evaluatedConfig.services.forgejo.enable; -assert evaluatedConfig.services.rabbi-gerzi.enable; assert virtualHosts."yisroelbaum.com".locations."/".root == "${self.inputs.resume.packages.${system}.default}"; @@ -65,10 +61,6 @@ assert evaluatedConfig.services.forgejo.settings.mailer.FROM == "me@yisroelbaum. assert evaluatedConfig.services.forgejo.secrets.mailer.USER == "/run/secrets/forgejo-mailer-user"; assert evaluatedConfig.services.forgejo.secrets.mailer.PASSWD == "/run/secrets/forgejo-mailer-password"; -assert evaluatedConfig.services.rabbi-gerzi.frontend.hostName == "rabbigerzi.yisroelbaum.com"; -assert evaluatedConfig.services.rabbi-gerzi.backend.hostName == "rabbigerziapi.yisroelbaum.com"; -assert - evaluatedConfig.services.rabbi-gerzi.backend.environmentFile == "/run/secrets/rabbi-gerzi.env"; assert forgejoBackup.repo == "ssh://n5lniyfd@n5lniyfd.repo.borgbase.com/./repo"; assert forgejoBackup.startAt == "*-*-* 03:15:00"; assert forgejoBackup.persistentTimer;