Compare commits

..

No commits in common. "032a5f4b045c59f21ee168e83091ceadcd563992" and "21737592da5a6d1bf471514f31e52d1e01319523" have entirely different histories.

11 changed files with 15 additions and 29 deletions

1
.gitignore vendored
View file

@ -1 +0,0 @@
flake.lock

View file

@ -10,7 +10,6 @@ let
privateKey = mkOption { type = types.str; default = ""; };
shortId = mkOption { type = types.str; default = ""; };
spiderX = mkOption { type = types.str; default = "/"; };
sni = mkOption { type = types.str; default = "/"; };
};
affine-config = with lib; {
env = {
@ -26,7 +25,6 @@ in {
secret = {
artemisia = {
marzban = marzban-config;
yggdrasil.PrivateKey = mkOption { type = str; default = ""; };
};
mio = {
marzban = marzban-config;
@ -40,10 +38,8 @@ in {
common = {
yggdrasil = {
reine = mkOption { type = str; default = ""; };
artemisia = mkOption { type = str; default = ""; };
password = mkOption { type = str; default = ""; };
};
};
};
};
}
}

View file

@ -9,9 +9,7 @@
networking.hostName = "artemisia";
system.stateVersion = "25.05";
services.yggdrasil.settings.PrivateKey = secret.yggdrasil.PrivateKey;
services.yggdrasil.persistentKeys = false;
services.yggdrasil.persistentKeys = true;
marzban = {
env = {
UVICORN_HOST = "artemisia.project-a.space";
@ -29,7 +27,6 @@
privateKey = secret.marzban.privateKey;
shortId = secret.marzban.shortId;
spiderX = secret.marzban.spiderX;
sni = secret.marzban.sni;
};
};

View file

@ -39,9 +39,9 @@
listen [::0]:443;
proxy_pass $name;
ssl_preread on;
proxy_connect_timeout 30s;
proxy_connect_timeout 1s;
proxy_timeout 1h;
proxy_buffer_size 64k;
proxy_buffer_size 16k;
}
'';
};

View file

@ -1,4 +1,4 @@
{ server-domain, port, dest, privateKey, shortId, spiderX, sni }:
{ server-domain, port, dest, privateKey, shortId, spiderX }:
{
log.loglevel = "warning";
@ -34,7 +34,7 @@
dest = dest;
xver = 0;
serverNames = [
sni
server-domain
];
privateKey = privateKey;
SpiderX = spiderX;

View file

@ -5,7 +5,8 @@
enable = true;
settings = {
Peers = [
"tls://artemisia.project-a.space:666"
"tls://kuber.project-a.space:666"
"tls://arti.project-a.space:666"
"tls://reine.project-a.space:666"
];
Listen = [

View file

@ -42,7 +42,6 @@
privateKey = secret.marzban.privateKey;
shortId = secret.marzban.shortId;
spiderX = secret.marzban.spiderX;
sni = secret.marzban.sni;
};
};

View file

@ -28,9 +28,9 @@
listen [::0]:443;
proxy_pass $name;
ssl_preread on;
proxy_connect_timeout 30s;
proxy_connect_timeout 1s;
proxy_timeout 1h;
proxy_buffer_size 64k;
proxy_buffer_size 16k;
}
'';
};

View file

@ -11,14 +11,5 @@
services.yggdrasil.settings.PrivateKey = secret.yggdrasil.PrivateKey;
services.yggdrasil.persistentKeys = false;
hardware.amdgpu.opencl.enable = true;
hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ];
systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
];
hardware.graphics.enable = true;
hardware.graphics.enable32Bit = true;
hardware.amdgpu.overdrive.enable = true;
hardware.amdgpu.overdrive.ppfeaturemask = "0xffffffff";
environment.systemPackages = with pkgs; [ clinfo mesa.opencl ];
system.stateVersion = "25.05";
}

View file

@ -24,7 +24,6 @@
privateKey = secret.marzban.privateKey;
shortId = secret.marzban.shortId;
spiderX = secret.marzban.spiderX;
sni = secret.marzban.sni;
};
};

View file

@ -15,6 +15,10 @@
default marzban;
}
upstream git {
server 127.0.0.1:444;
}
upstream marzban {
server 127.0.0.1:1080;
}
@ -24,7 +28,7 @@
listen [::0]:443;
proxy_pass $name;
ssl_preread on;
proxy_connect_timeout 30s;
proxy_connect_timeout 1s;
proxy_timeout 1h;
proxy_buffer_size 16k;
}