diff --git a/hosts/nixedo/modules/nginx/default.nix b/hosts/nixedo/modules/nginx/default.nix index 6d397a25..b28403e0 100644 --- a/hosts/nixedo/modules/nginx/default.nix +++ b/hosts/nixedo/modules/nginx/default.nix @@ -51,5 +51,5 @@ in users.users.${config.services.nginx.user}.extraGroups = [ "acme" ]; - imports = [ ./www.oliverdavies.uk.nix ]; + imports = [ ./www.oliverdavies.uk ]; } diff --git a/hosts/nixedo/modules/nginx/www.oliverdavies.uk.nix b/hosts/nixedo/modules/nginx/www.oliverdavies.uk/default.nix similarity index 91% rename from hosts/nixedo/modules/nginx/www.oliverdavies.uk.nix rename to hosts/nixedo/modules/nginx/www.oliverdavies.uk/default.nix index ce3178bf..0db7a938 100644 --- a/hosts/nixedo/modules/nginx/www.oliverdavies.uk.nix +++ b/hosts/nixedo/modules/nginx/www.oliverdavies.uk/default.nix @@ -4,10 +4,8 @@ let ports = config.homelab.ports; port = ports.nginx-website-sculpin; - redirects = import ./www.oliverdavies.uk-redirects.nix; - - redirectLines = builtins.concatStringsSep "\n" ( - map (r: "rewrite ^${r.from}/?$ ${r.to} redirect;") redirects + redirects = builtins.concatStringsSep "\n" ( + map (r: "rewrite ^${r.from}/?$ ${r.to} redirect;") (import ./redirects.nix) ); tome = { @@ -65,7 +63,7 @@ in rewrite ^/talks/(.*)$ /presentations/$1 permanent; rewrite ^/talks/?$ /presentations permanent; - ${redirectLines} + ${redirects} ''; }; diff --git a/hosts/nixedo/modules/nginx/www.oliverdavies.uk-redirects.nix b/hosts/nixedo/modules/nginx/www.oliverdavies.uk/redirects.nix similarity index 100% rename from hosts/nixedo/modules/nginx/www.oliverdavies.uk-redirects.nix rename to hosts/nixedo/modules/nginx/www.oliverdavies.uk/redirects.nix