opdavies/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor website vhost configuration
All checks were successful
/ check (push) Successful in 1m25s
Details

Browse source
This commit is contained in:
Oliver Davies 2025-05-03 22:57:57 +01:00
parent f42833545b
commit 58c3d276b0
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/nixedo/modules/nginx/default.nix
View file

@ -51,5 +51,5 @@ in
users.users.${config.services.nginx.user}.extraGroups = [ "acme" ]; users.users.${config.services.nginx.user}.extraGroups = [ "acme" ];
imports = [ ./www.oliverdavies.uk.nix ]; imports = [ ./www.oliverdavies.uk ];
} }

8
hosts/nixedo/modules/nginx/www.oliverdavies.uk.nix → hosts/nixedo/modules/nginx/www.oliverdavies.uk/default.nix
View file

@ -4,10 +4,8 @@ let
ports = config.homelab.ports; ports = config.homelab.ports;
port = ports.nginx-website-sculpin; port = ports.nginx-website-sculpin;
redirects = import ./www.oliverdavies.uk-redirects.nix; redirects = builtins.concatStringsSep "\n" (
map (r: "rewrite ^${r.from}/?$ ${r.to} redirect;") (import ./redirects.nix)
redirectLines = builtins.concatStringsSep "\n" (
map (r: "rewrite ^${r.from}/?$ ${r.to} redirect;") redirects
); );
tome = { tome = {
@ -65,7 +63,7 @@ in
rewrite ^/talks/(.*)$ /presentations/$1 permanent; rewrite ^/talks/(.*)$ /presentations/$1 permanent;
rewrite ^/talks/?$ /presentations permanent; rewrite ^/talks/?$ /presentations permanent;
${redirectLines} ${redirects}
''; '';
}; };

0
hosts/nixedo/modules/nginx/www.oliverdavies.uk-redirects.nix → hosts/nixedo/modules/nginx/www.oliverdavies.uk/redirects.nix
View file