diff --git a/hosts/linode/l002/flake.nix b/hosts/linode/l002/flake.nix index c5abb4ed..847445d9 100644 --- a/hosts/linode/l002/flake.nix +++ b/hosts/linode/l002/flake.nix @@ -29,7 +29,7 @@ "/run/agenix/nix2linode" ]; nodes.${configuration_name} = { - hostname = "100.64.0.4"; + hostname = "172.234.26.141"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.${configuration_name}; diff --git a/hosts/linode/l002/nginx.nix b/hosts/linode/l002/nginx.nix index bc4bc695..314cd849 100644 --- a/hosts/linode/l002/nginx.nix +++ b/hosts/linode/l002/nginx.nix @@ -152,28 +152,29 @@ ''; }; +# this breaks on restart on the server side no idea, can no longer ssh in 22 normally # Convoluted way to get ssh to work for git server while also still allowing # ssh connections to the machine normally (you can't have nginx bind port 22 since sshd does) # but sshd allows us to use a ForceCommand that we cna then proxy through - environment.systemPackages = with pkgs; [ - # NOTE requires nc which I am getting from somewhere.... would be better to put it here in sys packs? - (writeScriptBin "proxy-to-git" '' - #!${pkgs.bash}/bin/bash - nc 100.64.0.2 6611 - '') - ]; - -# TODO havent gotten this fully working yet - - services.openssh.extraConfig = '' - Match Host git.joshuabell.xyz - ForceCommand proxy-to-git - PermitTTY no - X11Forwarding no - PermitTunnel no - GatewayPorts no - AllowAgentForwarding no - ''; +# environment.systemPackages = with pkgs; [ +# # NOTE requires nc which I am getting from somewhere.... would be better to put it here in sys packs? +# (writeScriptBin "proxy-to-git" '' +# #!${pkgs.bash}/bin/bash +# nc 100.64.0.2 6611 +# '') +# ]; +# +# # TODO havent gotten this fully working yet +# +# services.openssh.extraConfig = '' +# Match Host git.joshuabell.xyz +# ForceCommand proxy-to-git +# PermitTTY no +# X11Forwarding no +# PermitTunnel no +# GatewayPorts no +# AllowAgentForwarding no +# ''; networking.firewall.allowedTCPPorts = [ 80 # web http