refactor(rrv.sh): change rrv.sh to use service module
This commit is contained in:
parent
7c633c124f
commit
92971a42a7
4 changed files with 25 additions and 28 deletions
28
flake.lock
generated
28
flake.lock
generated
|
@ -923,21 +923,20 @@
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"stable-diffusion-webui-nix": "stable-diffusion-webui-nix",
|
"stable-diffusion-webui-nix": "stable-diffusion-webui-nix",
|
||||||
"stylix": "stylix",
|
"stylix": "stylix",
|
||||||
"systems": "systems_3",
|
"systems": "systems_2",
|
||||||
"zjstatus": "zjstatus"
|
"zjstatus": "zjstatus"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rrv-sh": {
|
"rrv-sh": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_3"
|
||||||
"systems": "systems_2"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751063358,
|
"lastModified": 1751096589,
|
||||||
"narHash": "sha256-j5wlUaZ9I68naN5s8Qp8nk724ifS0Xa5lHK0djhSX/Q=",
|
"narHash": "sha256-/oqIAR0C2OlHeu/+2qCYbHIRR/CwIUh2AuGu3wGbm3Q=",
|
||||||
"ref": "refs/heads/prime",
|
"ref": "refs/heads/prime",
|
||||||
"rev": "e4f7512702bf4fca25b4b80d53dcb726799bd76d",
|
"rev": "c7922e3bf2cffc5a67a55c1667431bab8eb155c9",
|
||||||
"revCount": 2,
|
"revCount": 11,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://forgejo@git.rrv.sh/rrvsh/rrv.sh"
|
"url": "ssh://forgejo@git.rrv.sh/rrvsh/rrv.sh"
|
||||||
},
|
},
|
||||||
|
@ -1117,21 +1116,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_2": {
|
"systems_2": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1689347949,
|
|
||||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default-linux",
|
|
||||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default-linux",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems_3": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
|
|
@ -83,6 +83,7 @@
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
stylix.nixosModules.stylix
|
stylix.nixosModules.stylix
|
||||||
stable-diffusion-webui-nix.nixosModules.default
|
stable-diffusion-webui-nix.nixosModules.default
|
||||||
|
rrv-sh.nixosModules.default
|
||||||
];
|
];
|
||||||
homes.modules = with inputs; [
|
homes.modules = with inputs; [
|
||||||
impermanence.homeManagerModules.impermanence
|
impermanence.homeManagerModules.impermanence
|
||||||
|
|
16
modules/nixos/server/web-apps/rrv-sh/default.nix
Normal file
16
modules/nixos/server/web-apps/rrv-sh/default.nix
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
{ config, lib, ... }:
|
||||||
|
let
|
||||||
|
inherit (lib.pantheon.modules) mkWebApp;
|
||||||
|
cfg = config.server.web-apps.rrv-sh;
|
||||||
|
in
|
||||||
|
mkWebApp {
|
||||||
|
inherit config;
|
||||||
|
name = "rrv-sh";
|
||||||
|
defaultPort = 2309;
|
||||||
|
extraConfig = {
|
||||||
|
services.rrv-sh = {
|
||||||
|
enable = true;
|
||||||
|
inherit (cfg) port;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -39,17 +39,13 @@
|
||||||
forgejo.openFirewall = true;
|
forgejo.openFirewall = true;
|
||||||
glance.enable = true;
|
glance.enable = true;
|
||||||
glance.domain = "glance.bwfiq.com";
|
glance.domain = "glance.bwfiq.com";
|
||||||
|
rrv-sh.enable = true;
|
||||||
|
rrv-sh.domain = "rrv.sh";
|
||||||
};
|
};
|
||||||
web-servers = {
|
web-servers = {
|
||||||
enableSSL = true;
|
enableSSL = true;
|
||||||
nginx = {
|
nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
pages = [
|
|
||||||
{
|
|
||||||
domain = "rrv.sh";
|
|
||||||
root = inputs.rrv-sh.packages.x86_64-linux.default;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
proxies = [
|
proxies = [
|
||||||
{
|
{
|
||||||
source = "aenyrathia.wiki";
|
source = "aenyrathia.wiki";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue