feat: Refactor web-servers module and move common configuration to common.nix

This commit is contained in:
Mohammad Rafiq 2025-06-12 21:35:43 +08:00
parent 7093a338f4
commit e5f942acbe
No known key found for this signature in database
7 changed files with 94 additions and 76 deletions

View file

@ -3,10 +3,10 @@
...
}:
{
imports = lib.singleton ../common.nix;
system = {
hostname = "apollo";
mainUser.name = "rafiq";
mainUser.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdsZyY3gu8IGB8MzMnLdh+ClDxQQ2RYG9rkeetIKq8n";
bootloader = "systemd-boot";
};
@ -21,7 +21,6 @@
server = {
enableDDNS = true;
mountHelios = true;
databases = {
mongodb.enable = true;
mysql.enable = true;
@ -32,22 +31,25 @@
mattermost.enable = true;
mattermost.url = "mm.bwfiq.com";
};
web-servers.nginx.enable = true;
web-servers.nginx.proxies = [
{
source = "aenyrathia.wiki";
target = "http://helios:5896";
}
{
source = "chat.bwfiq.com";
target = "http://localhost:3080";
}
{
source = "il.bwfiq.com";
target = "http://helios:2283";
}
];
web-servers = {
nginx = {
enable = true;
proxies = [
{
source = "aenyrathia.wiki";
target = "http://helios:5896";
}
{
#TODO: merge into librechat module
source = "chat.bwfiq.com";
target = "http://localhost:3080";
}
{
source = "il.bwfiq.com";
target = "http://helios:2283";
}
];
};
};
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

@ -0,0 +1,9 @@
{
system.mainUser = {
name = "rafiq";
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdsZyY3gu8IGB8MzMnLdh+ClDxQQ2RYG9rkeetIKq8n";
email = "rafiq@rrv.sh";
};
server.mountHelios = true;
nixpkgs.hostPlatform = "x86_64-linux";
}

View file

@ -3,8 +3,6 @@
system = {
hostname = "mellinoe";
mainUser.name = "rafiq";
mainUser.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdsZyY3gu8IGB8MzMnLdh+ClDxQQ2RYG9rkeetIKq8n";
bootloader = "systemd-boot";
};
@ -32,10 +30,4 @@
refresh-rate = "60";
};
};
server = {
mountHelios = true;
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

@ -3,10 +3,10 @@
...
}:
{
imports = lib.singleton ../common.nix;
system = {
hostname = "nemesis";
mainUser.name = "rafiq";
mainUser.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdsZyY3gu8IGB8MzMnLdh+ClDxQQ2RYG9rkeetIKq8n";
bootloader = "systemd-boot";
};
@ -41,16 +41,10 @@
enableSunshine = true;
};
server = {
mountHelios = true;
};
services = {
tor = {
enable = true;
client.enable = true;
};
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}