From 39854d71b2afa5e793acb6a76f30b038bf569cca Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 9 Feb 2020 00:01:07 +0000 Subject: refactor(web): Serve static assets to //web/homepage Shuffles around the nginx locations that are served to ensure that all static content will be served from tazj.in/static (including for the blog). --- web/blog/default.nix | 2 -- web/blog/fragments.nix | 24 +++++------------------- web/homepage/nginx.nix | 12 +++++------- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/web/blog/default.nix b/web/blog/default.nix index 4fa97f2248ee..73b1bc20e3e7 100644 --- a/web/blog/default.nix +++ b/web/blog/default.nix @@ -34,8 +34,6 @@ let rendered = pkgs.third_party.runCommandNoCC "tazjins-blog" {} '' mkdir -p $out - cp ${fragments.blogIndex posts} $out/index.html - ${lib.concatStringsSep "\n" (map (post: "cp ${fragments.renderPost post} $out/${post.key}.html" ) posts)} diff --git a/web/blog/fragments.nix b/web/blog/fragments.nix index 4af642c01e24..646cd7d3172d 100644 --- a/web/blog/fragments.nix +++ b/web/blog/fragments.nix @@ -20,15 +20,13 @@ let - + - tazjin's blog${lib.optionalString (title != "") ( - ": " + (escape title) - )} + tazjin's blog: ${escape title} - +

tazjin's blog

tazjin's interblag

''; @@ -68,18 +66,6 @@ let isDraft = post: (hasAttr "draft" post) && post.draft; isUnlisted = post: (hasAttr "listed" post) && !post.listed; includePost = post: !(isDraft post) && !(isUnlisted post); - - indexEntry= post: "

a blog post

"; - blogIndex = posts: writeText "blog-index.html" (lib.concatStrings ( - [ - (header "") - "

" - ] - ++ (map indexEntry (filter includePost posts)) - ++ [ - "" - footer - ])); in { - inherit blogIndex renderPost; + inherit renderPost; } diff --git a/web/homepage/nginx.nix b/web/homepage/nginx.nix index 90a13a1e98f9..33b89ee7cc97 100644 --- a/web/homepage/nginx.nix +++ b/web/homepage/nginx.nix @@ -6,7 +6,7 @@ writeText, writeShellScriptBin, nginx, lib, # website content - blog + blog, website }: let @@ -44,15 +44,13 @@ let server { listen 8080 default_server; - root ${blog.rendered}; - - location /static { - alias ${blog.static}/; - } + root ${website}; ${oldRedirects} - location / { + location /blog { + alias ${blog.rendered}; + if ($request_uri ~ ^/(.*)\.html$) { return 302 /$1; } -- cgit 1.4.1