Avery/NixOS
Avery/NixOS
1
0
Fork 0
Code Activity

Compare commits

base: Avery:f2112802f7bdea3a0ca268bcd8625c8d9abf6a34
Branches Tags
Avery:main
..
compare: Avery:3bff0ca1d2b45607d96513f60280f7e104a0d307
Branches Tags
Avery:main

No commits in common. "f2112802f7bdea3a0ca268bcd8625c8d9abf6a34" and "3bff0ca1d2b45607d96513f60280f7e104a0d307" have entirely different histories.
f2112802f7 ... 3bff0ca1d2

3 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hosts/greatyamada/services/_port-definitions.nix
View file

@ -3,8 +3,6 @@
adguardhome = { adguardhome = {
dns = 53; dns = 53;
http = 3001; http = 3001;
https = 4430;
dns_over_tls = 853;
}; };
forgejo = 3000; forgejo = 3000;
jellyfin = 8096; jellyfin = 8096;
@ -26,7 +24,6 @@
adguardhome = { adguardhome = {
dns = 53; dns = 53;
dhcp = 67; dhcp = 67;
dns_over_quic = 853;
}; };
wireguard = 51820; wireguard = 51820;
}; };

16
hosts/greatyamada/services/adguardhome.nix
View file

@ -4,8 +4,8 @@ let
nginxLocalServiceConfig = import ./nginx-local-config.nix; nginxLocalServiceConfig = import ./nginx-local-config.nix;
in { in {
networking.firewall = { networking.firewall = {
allowedTCPPorts = with ports.tcp.adguardhome; [ dns dns_over_tls ]; allowedTCPPorts = with ports.tcp.adguardhome; [ dns ];
allowedUDPPorts = with ports.udp.adguardhome; [ dns dhcp dns_over_quic ]; allowedUDPPorts = with ports.udp.adguardhome; [ dns dhcp ];
}; };
services = { services = {
adguardhome = { adguardhome = {
@ -27,15 +27,6 @@ in {
bootstrap_dns = bootstrap_dns =
[ "9.9.9.10" "149.112.112.10" "2620:fe::10" "2620:fe::fe:10" ]; [ "9.9.9.10" "149.112.112.10" "2620:fe::10" "2620:fe::fe:10" ];
}; };
tls = {
enabled = true;
server_name = "dns.rcia.dev";
port_https = ports.tcp.adguardhome.https;
port_dns_over_tls = ports.tcp.adguardhome.dns_over_tls;
port_dns_over_quic = ports.udp.adguardhome.dns_over_quic;
certificate_path = "/var/lib/acme/rcia.dev/fullchain.pem";
private_key_path = "/var/lib/acme/rcia.dev/key.pem";
};
dhcp = { dhcp = {
enabled = true; enabled = true;
interface_name = "enp5s0"; interface_name = "enp5s0";
@ -275,10 +266,9 @@ in {
nginx.virtualHosts."dns.rcia.dev" = { nginx.virtualHosts."dns.rcia.dev" = {
forceSSL = true; forceSSL = true;
locations."/".proxyPass = locations."/".proxyPass =
"https://127.0.0.1:${toString ports.tcp.adguardhome.https}"; "http://127.0.0.1:${toString ports.tcp.adguardhome.http}";
extraConfig = nginxLocalServiceConfig; extraConfig = nginxLocalServiceConfig;
useACMEHost = "rcia.dev"; useACMEHost = "rcia.dev";
}; };
}; };
users.groups.nginx.members = [ "adguardhome" ];
} }

2
hosts/greatyamada/services/minecraft/default.nix
View file

@ -179,7 +179,7 @@ in {
}; };
"~* ^/fabric_prod/(maps/[^/\\s]*/live/.*)" = { "~* ^/fabric_prod/(maps/[^/\\s]*/live/.*)" = {
proxyPass = "http://127.0.0.1:${ proxyPass = "http://127.0.0.1:${
toString ports.tcp.minecraft.fabric_prod.bluemap toString ports.tcp.minecraft.fabric-prod.bluemap
}/$1"; }/$1";
extraConfig = '' extraConfig = ''
error_page 502 504 = @server-offline; error_page 502 504 = @server-offline;