diff --git a/modules/muflax-blog.nix b/modules/muflax-blog.nix index 5bfd51c..f303c3a 100644 --- a/modules/muflax-blog.nix +++ b/modules/muflax-blog.nix @@ -49,6 +49,7 @@ in with lib; { } '') ["daily" "gospel" "blog"]); }; + services.tor.enable = true; services.tor.hiddenServices.muflax-blog.map = [{ port = 80; toPort = cfg.web-server.port; }]; services.tor.service-keys.muflax-blog = cfg.hidden-service.private_key; diff --git a/roles/default.nix b/roles/default.nix index d104423..8dd936b 100644 --- a/roles/default.nix +++ b/roles/default.nix @@ -49,24 +49,6 @@ in challengeResponseAuthentication = false; }; - services.tor = { - enable = true; - client.enable = true; - # ssh hidden service - hiddenServices.ssh.map = [{ port = 22; }]; - service-keys.ssh = "/root/keys/ssh.${machine}.key"; - }; - deployment.keyys = [ ( + "/ssh.${machine}.key") ]; - - programs.ssh.extraConfig = '' - Host *.onion - ProxyCommand nc -xlocalhost:9050 -X5 %h %p - '' + - (with lib; (flip concatMapStrings) (filter (hasPrefix "ssh.") (attrNames secrets.tor_hostnames)) (name: '' - Host ${removePrefix "ssh." name}.onion - hostname ${secrets.tor_hostnames.${name}} - '' - )); environment.systemPackages = with pkgs; [ # v important.