revert ssh attempt for git

This commit is contained in:
RingOfStorms (Joshua Bell) 2025-02-13 00:44:14 -06:00
parent e27a4af6d2
commit 9ae2d1e162
2 changed files with 21 additions and 20 deletions

View file

@ -29,7 +29,7 @@
"/run/agenix/nix2linode" "/run/agenix/nix2linode"
]; ];
nodes.${configuration_name} = { nodes.${configuration_name} = {
hostname = "100.64.0.4"; hostname = "172.234.26.141";
profiles.system = { profiles.system = {
user = "root"; user = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.${configuration_name}; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.${configuration_name};

View file

@ -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 # 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) # 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 # but sshd allows us to use a ForceCommand that we cna then proxy through
environment.systemPackages = with pkgs; [ # environment.systemPackages = with pkgs; [
# NOTE requires nc which I am getting from somewhere.... would be better to put it here in sys packs? # # NOTE requires nc which I am getting from somewhere.... would be better to put it here in sys packs?
(writeScriptBin "proxy-to-git" '' # (writeScriptBin "proxy-to-git" ''
#!${pkgs.bash}/bin/bash # #!${pkgs.bash}/bin/bash
nc 100.64.0.2 6611 # nc 100.64.0.2 6611
'') # '')
]; # ];
#
# TODO havent gotten this fully working yet # # TODO havent gotten this fully working yet
#
services.openssh.extraConfig = '' # services.openssh.extraConfig = ''
Match Host git.joshuabell.xyz # Match Host git.joshuabell.xyz
ForceCommand proxy-to-git # ForceCommand proxy-to-git
PermitTTY no # PermitTTY no
X11Forwarding no # X11Forwarding no
PermitTunnel no # PermitTunnel no
GatewayPorts no # GatewayPorts no
AllowAgentForwarding no # AllowAgentForwarding no
''; # '';
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
80 # web http 80 # web http