diff --git a/nixos/hosts/pihole/default.nix b/nixos/hosts/pihole/default.nix index 88e714e..a8648ba 100644 --- a/nixos/hosts/pihole/default.nix +++ b/nixos/hosts/pihole/default.nix @@ -3,6 +3,7 @@ ../../templates/proxmox-lxc.nix ../../server.nix ../../features/podman.nix + # ../../features/nginx.nix ]; networking.hostName = "pihole"; @@ -10,7 +11,7 @@ nixpkgs.hostPlatform = "x86_64-linux"; networking.firewall = { - allowedTCPPorts = [ 53 80 ]; + allowedTCPPorts = [ 53 80 443 ]; allowedUDPPorts = [ 53 ]; }; @@ -18,20 +19,39 @@ enable = false; }; - networking.nameservers = [ - "2606:4700:4700::1111#one.one.one.one" - "2606:4700:4700::1001#one.one.one.one" - "1.1.1.1#one.one.one.one" - "1.0.0.1#one.one.one.one" + networking.nameservers = lib.mkForce [ + "2606:4700:4700::1111" + "2606:4700:4700::1001" + "1.1.1.1" + "1.0.0.1" ]; + + # services.nginx = { + # virtualHosts."pihole.hoki-porgy.ts.net" = { + # listen = [ + # { addr = "0.0.0.0"; port = 443; ssl = true; } + # { addr = "[::]"; port = 443; ssl = true; } + # ]; + + + + # locations."/" = { + # recommendedProxySettings = true; + # proxyPass = "http://localhost:80"; + # }; + # }; + # }; virtualisation.oci-containers.containers = { pihole = { - image = "docker.io/pihole/pihole"; + image = "ghcr.io/pi-hole/pihole:nightly"; ports = [ "53:53/tcp" "53:53/udp" "80:80/tcp" + "443:443/tcp" + "67:67/tcp" + "67:67/udp" ]; volumes = [ "etc-pihole:/etc/pihole" @@ -41,8 +61,9 @@ TZ = config.time.timeZone; VIRTUAL_HOST = "pihole.hoki-porgy.ts.net"; PROXY_LOCATION = "pihole.hoki-porgy.ts.net"; - # FTLCONF_LOCAL_IPV4 = config.networking.interfaces.tailscale0.ipv4.addresses[0].address; + DNSMASQ_LISTENING = "all"; }; + extraOptions = ["--dns=127.0.0.1" "--dns=1.1.1.1" "--cap-add=NET_ADMIN"]; }; }; } diff --git a/nixos/hosts/seedbox/default.nix b/nixos/hosts/seedbox/default.nix index eb72d02..81e03cd 100644 --- a/nixos/hosts/seedbox/default.nix +++ b/nixos/hosts/seedbox/default.nix @@ -17,5 +17,5 @@ nixpkgs.hostPlatform = "x86_64-linux"; internal.nas0.useSMB = true; - internal.nas0.lazyMount = false; + internal.nas0.lazyMount = true; } diff --git a/nixos/hosts/seedbox/www/index.html b/nixos/hosts/seedbox/www/index.html index c848db8..a418642 100644 --- a/nixos/hosts/seedbox/www/index.html +++ b/nixos/hosts/seedbox/www/index.html @@ -1,9 +1,83 @@ -
user: foxfox
-