From 74a3b2690604919b9dda66fb50c1e5fe666bfd2d Mon Sep 17 00:00:00 2001 From: Trevor Vallender Date: Wed, 27 Sep 2023 15:38:38 +0100 Subject: [PATCH] Attempting to set up gitweb --- system/kernighan/kernighan.nix | 2 +- system/shared/services/git.nix | 11 ----------- system/shared/services/gitweb.nix | 8 ++++++++ system/shared/services/nginx.nix | 8 +++++--- 4 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 system/shared/services/git.nix create mode 100644 system/shared/services/gitweb.nix diff --git a/system/kernighan/kernighan.nix b/system/kernighan/kernighan.nix index 538c9ec..94322e3 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 - ../shared/services/git.nix + ../shared/services/gitweb.nix ../shared/services/nginx.nix ]; diff --git a/system/shared/services/git.nix b/system/shared/services/git.nix deleted file mode 100644 index 0392453..0000000 --- a/system/shared/services/git.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, pkgs, inputs, ... }: - -{ - services.gitDaemon = { - enable = true; - basePath = "/home/git/repositories/"; - exportAll = true; - # port = 9418; # default - }; -} - diff --git a/system/shared/services/gitweb.nix b/system/shared/services/gitweb.nix new file mode 100644 index 0000000..b1bb454 --- /dev/null +++ b/system/shared/services/gitweb.nix @@ -0,0 +1,8 @@ +{ config, pkgs, inputs, ... }: + +{ + services.gitweb = { + projectroot = "/home/tsv/git"; + }; +} + diff --git a/system/shared/services/nginx.nix b/system/shared/services/nginx.nix index 91d128c..89d29f7 100644 --- a/system/shared/services/nginx.nix +++ b/system/shared/services/nginx.nix @@ -4,6 +4,11 @@ services.nginx = { enable = true; + gitweb = { + enable = true; + virtualHost = "git.tsvallender.co.uk"; + location = "/home/tsv/git"; + }; recommendedGzipSettings = true; recommendedOptimisation = true; recommendedProxySettings = true; @@ -19,9 +24,6 @@ virtualHosts."git.tsvallender.co.uk" = { forceSSL = true; enableACME = true; - locations."/" = { - proxyPass = "http://127.0.0.1:8384"; - }; }; }; security.acme = {