diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-02-09T00·01+0000 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-02-09T00·01+0000 |
| commit | 39854d71b2afa5e793acb6a76f30b038bf569cca (patch) | |
| tree | 8dce2bdbbc3dd144b4d501989a5f07803bfe3f93 | |
| parent | e6002f95cd3ad5c4ee449e6a51c50f07da26f287 (diff) | |
refactor(web): Serve static assets to //web/homepage r/490
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).
| -rw-r--r-- | web/blog/default.nix | 2 | ||||
| -rw-r--r-- | web/blog/fragments.nix | 24 | ||||
| -rw-r--r-- | 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 4fa97f2248..73b1bc20e3 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 4af642c01e..646cd7d317 100644 --- a/web/blog/fragments.nix +++ b/web/blog/fragments.nix @@ -20,15 +20,13 @@ let <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content="tazjin's blog"> - <link rel="stylesheet" type="text/css" href="static/blog.css" media="all"> + <link rel="stylesheet" type="text/css" href="/static/tazjin.css" media="all"> <link rel="alternate" type="application/rss+xml" title="RSS-Feed" href="/rss.xml"> - <title>tazjin's blog${lib.optionalString (title != "") ( - ": " + (escape title) - )}</title> + <title>tazjin's blog: ${escape title}</title> </head> - <body> + <body class="light"> <header> - <h1><a class="unstyled-link" href="/">tazjin's blog</a> </h1> + <h1><a class="blog-title" href="/">tazjin's interblag</a> </h1> <hr> </header> ''; @@ -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: "<li>a blog post</li>"; - blogIndex = posts: writeText "blog-index.html" (lib.concatStrings ( - [ - (header "") - "<ul>" - ] - ++ (map indexEntry (filter includePost posts)) - ++ [ - "</ul>" - footer - ])); in { - inherit blogIndex renderPost; + inherit renderPost; } diff --git a/web/homepage/nginx.nix b/web/homepage/nginx.nix index 90a13a1e98..33b89ee7cc 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; } |