chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2024-10-23 09:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

services.xray.server: generalize settings

Browse Source
This commit is contained in:
陈浩南 2024-03-15 10:56:36 +08:00
parent 584298407d
commit 51077626dc
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/vps6/default.nix
View File

@ -36,7 +36,7 @@ inputs:
{ {
snapper.enable = false; snapper.enable = false;
sshd.enable = true; sshd.enable = true;
xray.server = { enable = true; serverName = "vps6.xserver.chn.moe"; }; xray.server = { serverName = "vps6.xserver.chn.moe"; userNumber = 13; };
frpServer = { enable = true; serverName = "frp.chn.moe"; }; frpServer = { enable = true; serverName = "frp.chn.moe"; };
nginx = nginx =
{ {

13
modules/services/xray.nix
View File

@ -14,10 +14,17 @@ inputs:
}; };
dae.wanInterface = mkOption { type = types.listOf types.nonEmptyStr; default = [ "auto" ]; }; dae.wanInterface = mkOption { type = types.listOf types.nonEmptyStr; default = [ "auto" ]; };
}; };
server = server = mkOption
{
type = types.nullOr (types.submodule
{
options =
{ {
enable = mkOption { type = types.bool; default = false; };
serverName = mkOption { type = types.nonEmptyStr; }; serverName = mkOption { type = types.nonEmptyStr; };
userNumber = mkOption { type = types.ints.unsigned; };
};
});
default = null;
}; };
}; };
config = let inherit (inputs.config.nixos.services) xray; in inputs.lib.mkMerge config = let inherit (inputs.config.nixos.services) xray; in inputs.lib.mkMerge
@ -263,7 +270,7 @@ inputs:
} }
) )
( (
inputs.lib.mkIf xray.server.enable (let userList = builtins.genList (n: n) 13; in inputs.lib.mkIf (xray.server != null) (let userList = builtins.genList (n: n) xray.server.userNumber; in
{ {
services.xray = { enable = true; settingsFile = inputs.config.sops.templates."xray-server.json".path; }; services.xray = { enable = true; settingsFile = inputs.config.sops.templates."xray-server.json".path; };
sops = sops =