From 8f228ed3571b5237d008354e709eff624c46a285 Mon Sep 17 00:00:00 2001 From: Trevor Vallender Date: Wed, 27 Sep 2023 14:49:16 +0100 Subject: [PATCH] Change settings for new git server --- system/eno/eno.nix | 1 - system/kernighan/kernighan.nix | 2 +- system/ritchie/ritchie.nix | 1 - system/shared/services/nginx.nix | 7 +++++++ users/tsv/ssh/config | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/system/eno/eno.nix b/system/eno/eno.nix index e6e975b..4239105 100644 --- a/system/eno/eno.nix +++ b/system/eno/eno.nix @@ -5,7 +5,6 @@ imports = [ ../shared/shared-configuration.nix - ../shared/services/mopidy.nix ./eno-hardware.nix ]; diff --git a/system/kernighan/kernighan.nix b/system/kernighan/kernighan.nix index d83bf9d..538c9ec 100644 --- a/system/kernighan/kernighan.nix +++ b/system/kernighan/kernighan.nix @@ -7,7 +7,7 @@ ../shared/shared-configuration.nix ./kernighan-hardware.nix ../shared/services/syncthing.nix - #./services/git.nix + ../shared/services/git.nix ../shared/services/nginx.nix ]; diff --git a/system/ritchie/ritchie.nix b/system/ritchie/ritchie.nix index 030ea5b..f765897 100644 --- a/system/ritchie/ritchie.nix +++ b/system/ritchie/ritchie.nix @@ -18,7 +18,6 @@ in ../shared/desktop.nix ./ritchie-hardware.nix ../shared/filesystem.nix - ../shared/services/mopidy.nix ]; networking = { diff --git a/system/shared/services/nginx.nix b/system/shared/services/nginx.nix index 90784b2..91d128c 100644 --- a/system/shared/services/nginx.nix +++ b/system/shared/services/nginx.nix @@ -16,6 +16,13 @@ proxyPass = "http://127.0.0.1:8384"; }; }; + virtualHosts."git.tsvallender.co.uk" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://127.0.0.1:8384"; + }; + }; }; security.acme = { acceptTerms = true; diff --git a/users/tsv/ssh/config b/users/tsv/ssh/config index 08c76f7..8fff986 100644 --- a/users/tsv/ssh/config +++ b/users/tsv/ssh/config @@ -14,7 +14,7 @@ Host kernighan Host git.tsvallender.co.uk HostName git.tsvallender.co.uk IdentityFile /home/tsv/.ssh/personal - Port 222 + Port 2222 User tsv IdentitiesOnly yes