asmir/nixos_flake_config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

magpie: remove restya, add 3proxy

Browse Source
This commit is contained in:
Asmir A 2024-03-17 19:33:03 +01:00
parent c66a23bf94
commit d9ae2d4e69
Signed by: asmir
GPG Key ID: 020C42B7A9ABA3E2
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
magpie/configuration.nix
View File

@ -13,8 +13,6 @@
nix.optimise.automatic = true; nix.optimise.automatic = true;
nix.settings.experimental-features = ["nix-command" "flakes"]; nix.settings.experimental-features = ["nix-command" "flakes"];
nixpkgs.overlays = [ nvim.overlays.${system}.overlay ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.configurationLimit = 2; boot.loader.systemd-boot.configurationLimit = 2;
@ -41,6 +39,7 @@
fzy fzy
git git
goatcounter.packages.${system}.goatcounter goatcounter.packages.${system}.goatcounter
nvim.packages.${system}.nvim
htop-vim htop-vim
nvim nvim
pciutils pciutils
@ -93,17 +92,10 @@
}; };
}; };
services.restya-board = {
enable = true;
virtualHost.serverName = "board.project-cloud.net";
virtualHost.listenHost = "localhost";
virtualHost.listenPort = 4001;
};
services.goatcounter = { services.goatcounter = {
enable = true; enable = true;
environmentFile = "/var/lib/goatcounter.env"; environmentFile = "/var/lib/goatcounter.env";
extraArgs = ["-listen='*:8002'" "-tls=proxy" ]; extraArgs = ["-listen='*:8002'" "-tls=proxy"];
database = { database = {
backend = "sqlite"; backend = "sqlite";
name = "goatcounter"; name = "goatcounter";
@ -182,15 +174,6 @@
}; };
}; };
virtualHosts."board.project-cloud.net" = {
quic = true;
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://localhost:${toString config.services.restya-board.virtualHost.listenPort}";
};
};
virtualHosts."stats.project-cloud.net" = { virtualHosts."stats.project-cloud.net" = {
quic = true; quic = true;
forceSSL = true; forceSSL = true;
@ -247,6 +230,24 @@
ProtectSystem = lib.mkForce false; ProtectSystem = lib.mkForce false;
}; };
services._3proxy = {
enable = true;
services = [
{
type = "socks";
auth = ["strong"];
acl = [
{
rule = "allow";
users = ["3proxy_user"];
}
];
bindPort = 13128;
}
];
usersFile = config.sops.secrets."3proxy".path;
};
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
defaults.email = "asmir.abdulahovic@gmail.com"; defaults.email = "asmir.abdulahovic@gmail.com";
@ -276,8 +277,13 @@
owner = config.users.users.nextcloud.name; owner = config.users.users.nextcloud.name;
}; };
sops.secrets."3proxy" = {
sopsFile = ./secrets/3proxy.yaml;
};
networking.firewall.enable = true; networking.firewall.enable = true;
networking.firewall.allowedTCPPorts = [80 443 587]; networking.firewall.allowedTCPPorts = [80 443 587 13128];
networking.firewall.allowedUDPPorts = []; networking.firewall.allowedUDPPorts = [];
networking.firewall.allowPing = true; networking.firewall.allowPing = true;
networking.firewall.logRefusedConnections = lib.mkDefault false; networking.firewall.logRefusedConnections = lib.mkDefault false;