maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(web/blog): make base URL configurable for atom feeds

Browse source 
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>
This commit is contained in:
Vincent Ambo 2021-11-05 14:19:06 +01:00 • committed by tazjin
parent bb980158a7
commit 875ef0a605
6 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
web/tvl/blog/default.nix
View file

@ -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";

14
web/tvl/default.nix
View file

@ -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
''