diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-11-05T13·19+0100 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-11-08T10·39+0000 |
| commit | 875ef0a605c298e3033ef950119092d09e21f306 (patch) | |
| tree | d81aaa06061953fad90a5b8f165cd31d023c5eb9 /web/tvl | |
| parent | bb980158a785b0ce23d25fa0f74c996311df7a67 (diff) | |
fix(web/blog): make base URL configurable for atom feeds r/3025
This was previously hardcoded to tazj.in, which is not going to work of course. Instead it now takes the blog config which has a new baseUrl parameter. For ease of use, the configs of my and the TVL blog have been moved into a location that is accessible in the tree for reuse. Change-Id: I94e71aaa7859db4380eb7013740a17f6b6a02620 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3777 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'web/tvl')
| -rw-r--r-- | web/tvl/blog/default.nix | 6 | ||||
| -rw-r--r-- | web/tvl/default.nix | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/web/tvl/blog/default.nix b/web/tvl/blog/default.nix index fac627a94099..cedfc6b41787 100644 --- a/web/tvl/blog/default.nix +++ b/web/tvl/blog/default.nix @@ -1,6 +1,12 @@ { depot, ... }: { + config = { + name = "TVL's blog"; + footer = depot.web.tvl.footer {}; + baseUrl = "https://tvl.fyi/blog"; + }; + posts = [ { key = "kicking-off-tvix"; diff --git a/web/tvl/default.nix b/web/tvl/default.nix index c40335003139..4a3688bf3177 100644 --- a/web/tvl/default.nix +++ b/web/tvl/default.nix @@ -4,16 +4,12 @@ with depot.nix.yants; let inherit (pkgs) graphviz runCommandNoCC writeText; - inherit (depot.web) blog atom-feed; + inherit (depot.web) atom-feed blog tvl; - blogConfig = { - name = "TVL's blog"; - footer = depot.web.tvl.footer {}; - }; postRenderingCommands = defun [ (list blog.post) string ] (posts: lib.concatStringsSep "\n" - (map (p: "cp ${blog.renderPost blogConfig p} $out/blog/${p.key}.html") posts) + (map (p: "cp ${blog.renderPost tvl.blog.config p} $out/blog/${p.key}.html") posts) ); tvlGraph = runCommandNoCC "tvl.svg" { @@ -33,12 +29,12 @@ let href = "https://tvl.fyi/feed.atom"; }; - entries = map blog.toFeedEntry depot.web.tvl.blog.posts; + entries = map (blog.toFeedEntry tvl.blog.config) tvl.blog.posts; }; atomFeed = writeText "feed.atom" (atom-feed.renderFeed feed); - homepage = depot.web.tvl.template { + homepage = tvl.template { title = "The Virus Lounge"; content = '' The Virus Lounge @@ -109,6 +105,6 @@ let in runCommandNoCC "website" {} '' mkdir -p $out/blog cp ${homepage} $out/index.html - ${postRenderingCommands depot.web.tvl.blog.posts} + ${postRenderingCommands tvl.blog.posts} cp ${atomFeed} $out/feed.atom '' |