From 3538874082ded7647b1ccec0343c7c1e882cfef3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 15 Jan 2021 07:31:29 +0000 Subject: modules: remove doh-proxy doh-proxy depends on aioh2, which hasn't been touched since 2018 and is incompatible with the current version of h2. It's been a while since I actually used DoH anyway, because I never got around to doing exceptions for captive portals and stuff, so for now I'll just delete the code, and I can revive it later with whatever the current leader in DoH proxy software is when I do. --- modules/server/dns/default.nix | 8 +------- modules/workstation/networking/default.nix | 22 +--------------------- 2 files changed, 2 insertions(+), 28 deletions(-) (limited to 'modules') diff --git a/modules/server/dns/default.nix b/modules/server/dns/default.nix index 6274d6b6b348..ae36f06a2f80 100644 --- a/modules/server/dns/default.nix +++ b/modules/server/dns/default.nix @@ -1,13 +1,7 @@ -{ pkgs, ... }: +{ ... }: { networking.nameservers = [ "127.0.0.1" ]; services.unbound.enable = true; - - systemd.services.doh-proxy = { - after = [ "networking.target" ]; - wantedBy = [ "multi-user.target" ]; - script = "exec ${pkgs.doh-proxy}/bin/doh-httpproxy --port 4448"; - }; } diff --git a/modules/workstation/networking/default.nix b/modules/workstation/networking/default.nix index 85149c7f8f93..9560d75dd2a6 100644 --- a/modules/workstation/networking/default.nix +++ b/modules/workstation/networking/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ config, ... }: { imports = [ ./castnow ]; @@ -24,25 +24,5 @@ networking.nameservers = [ "::1" ]; - networking.networkmanager.dispatcherScripts = [ - { - source = pkgs.writeText "doh-stub" '' - if [ "$2" = up ] - then systemctl restart doh-stub.service - fi - ''; - type = "basic"; - } - ]; - - systemd.services.doh-stub = { - script = '' - exec ${pkgs.doh-proxy}/bin/doh-stub \ - --level INFO \ - --domain qyliss.net \ - --remote-address 85.119.82.108 - ''; - }; - programs.mtr.enable = true; } -- cgit 1.4.1