remove Rabbi Gerzi ownership
This commit is contained in:
parent
b09be84f73
commit
4a489e90f3
5 changed files with 1 additions and 97 deletions
|
|
@ -6,8 +6,6 @@ This flake owns the production NixOS configuration for the web services under
|
||||||
- the MyResume package at `yisroelbaum.com`;
|
- the MyResume package at `yisroelbaum.com`;
|
||||||
- Jellyfin at `jellyfin.yisroelbaum.com`;
|
- Jellyfin at `jellyfin.yisroelbaum.com`;
|
||||||
- Forgejo at `git.yisroelbaum.com`, including its Borg backup;
|
- 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.
|
- nginx and per-host ACME certificates for those endpoints.
|
||||||
|
|
||||||
The importing host remains responsible for provisioning secrets. Import
|
The importing host remains responsible for provisioning secrets. Import
|
||||||
|
|
@ -22,7 +20,6 @@ services.yisroelbaum-web = {
|
||||||
borgPrivateKey = "/run/secrets/borg-private-key";
|
borgPrivateKey = "/run/secrets/borg-private-key";
|
||||||
forgejoMailerUser = "/run/secrets/forgejo-mailer-user";
|
forgejoMailerUser = "/run/secrets/forgejo-mailer-user";
|
||||||
forgejoMailerPassword = "/run/secrets/forgejo-mailer-password";
|
forgejoMailerPassword = "/run/secrets/forgejo-mailer-password";
|
||||||
rabbiGerziEnvironment = "/run/secrets/rabbi-gerzi.env";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
```
|
```
|
||||||
|
|
|
||||||
55
flake.lock
generated
55
flake.lock
generated
|
|
@ -16,27 +16,6 @@
|
||||||
"type": "github"
|
"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": {
|
"resume": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -60,42 +39,8 @@
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"rabbi-gerzi": "rabbi-gerzi",
|
|
||||||
"resume": "resume"
|
"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",
|
"root": "root",
|
||||||
|
|
|
||||||
12
flake.nix
12
flake.nix
|
|
@ -9,10 +9,6 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
rabbi-gerzi = {
|
|
||||||
url = "git+https://git.yisroelbaum.com/yisroelbaum/Rabbi_Gerzi";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
|
|
@ -20,7 +16,6 @@
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
resume,
|
resume,
|
||||||
rabbi-gerzi,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
|
@ -29,12 +24,7 @@
|
||||||
module = import ./nix/module.nix { inherit resume; };
|
module = import ./nix/module.nix { inherit resume; };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosModules.yisroelbaum-web = {
|
nixosModules.yisroelbaum-web = module;
|
||||||
imports = [
|
|
||||||
rabbi-gerzi.nixosModules.default
|
|
||||||
module
|
|
||||||
];
|
|
||||||
};
|
|
||||||
nixosModules.default = self.nixosModules.yisroelbaum-web;
|
nixosModules.default = self.nixosModules.yisroelbaum-web;
|
||||||
|
|
||||||
checks.${system}.module-eval = import ./nix/tests/module.nix {
|
checks.${system}.module-eval = import ./nix/tests/module.nix {
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@ in
|
||||||
borgPrivateKey = secretFileOption "Borg repository SSH private key file.";
|
borgPrivateKey = secretFileOption "Borg repository SSH private key file.";
|
||||||
forgejoMailerUser = secretFileOption "Forgejo SMTP username file.";
|
forgejoMailerUser = secretFileOption "Forgejo SMTP username file.";
|
||||||
forgejoMailerPassword = secretFileOption "Forgejo SMTP password 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 = {
|
nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
virtualHosts = {
|
virtualHosts = {
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@ let
|
||||||
borgPrivateKey = "/run/secrets/borg-private-key";
|
borgPrivateKey = "/run/secrets/borg-private-key";
|
||||||
forgejoMailerUser = "/run/secrets/forgejo-mailer-user";
|
forgejoMailerUser = "/run/secrets/forgejo-mailer-user";
|
||||||
forgejoMailerPassword = "/run/secrets/forgejo-mailer-password";
|
forgejoMailerPassword = "/run/secrets/forgejo-mailer-password";
|
||||||
rabbiGerziEnvironment = "/run/secrets/rabbi-gerzi.env";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -33,14 +32,11 @@ let
|
||||||
"yisroelbaum.com"
|
"yisroelbaum.com"
|
||||||
"jellyfin.yisroelbaum.com"
|
"jellyfin.yisroelbaum.com"
|
||||||
"git.yisroelbaum.com"
|
"git.yisroelbaum.com"
|
||||||
"rabbigerzi.yisroelbaum.com"
|
|
||||||
"rabbigerziapi.yisroelbaum.com"
|
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
assert evaluatedConfig.services.nginx.enable;
|
assert evaluatedConfig.services.nginx.enable;
|
||||||
assert evaluatedConfig.services.jellyfin.enable;
|
assert evaluatedConfig.services.jellyfin.enable;
|
||||||
assert evaluatedConfig.services.forgejo.enable;
|
assert evaluatedConfig.services.forgejo.enable;
|
||||||
assert evaluatedConfig.services.rabbi-gerzi.enable;
|
|
||||||
assert
|
assert
|
||||||
virtualHosts."yisroelbaum.com".locations."/".root
|
virtualHosts."yisroelbaum.com".locations."/".root
|
||||||
== "${self.inputs.resume.packages.${system}.default}";
|
== "${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.USER == "/run/secrets/forgejo-mailer-user";
|
||||||
assert
|
assert
|
||||||
evaluatedConfig.services.forgejo.secrets.mailer.PASSWD == "/run/secrets/forgejo-mailer-password";
|
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.repo == "ssh://n5lniyfd@n5lniyfd.repo.borgbase.com/./repo";
|
||||||
assert forgejoBackup.startAt == "*-*-* 03:15:00";
|
assert forgejoBackup.startAt == "*-*-* 03:15:00";
|
||||||
assert forgejoBackup.persistentTimer;
|
assert forgejoBackup.persistentTimer;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue