about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--corp/website/content.md2
-rw-r--r--corp/website/default.nix3
-rw-r--r--web/atward/indexHtml/default.nix1
-rw-r--r--web/cgit-taz/default.nix2
-rw-r--r--web/todolist/default.nix7
-rw-r--r--web/tvl/default.nix4
6 files changed, 8 insertions, 11 deletions
diff --git a/corp/website/content.md b/corp/website/content.md
index 6dba8dfdad57..f7ca9786fbea 100644
--- a/corp/website/content.md
+++ b/corp/website/content.md
@@ -3,7 +3,7 @@ The Virus Lounge
 
 ----------------
 
-<img class="tvl-logo" src="https://tvl.fyi/static/tvl-animated.svg"
+<img class="tvl-logo" src="https://static.tvl.su/latest/logo-animated.svg"
      alt="Virus with lambda-shaped spike proteins sitting on an armchair">
 
 Welcome to the corporate face of [The Virus Lounge][tvl-fyi].
diff --git a/corp/website/default.nix b/corp/website/default.nix
index fac9a7dce3e8..8740041d9be7 100644
--- a/corp/website/default.nix
+++ b/corp/website/default.nix
@@ -7,12 +7,11 @@ let
     "@context" = "https://schema.org";
     "@type" = "Organisation";
     url = "https://tvl.su";
-    logo = "https://tvl.fyi/static/tvl-animated.svg";
+    logo = "https://static.tvl.fyi/${depot.web.static.drvHash}/logo-animated.svg";
   };
   index = depot.web.tvl.template {
     title = "TVL (The Virus Lounge) - Software consulting";
     content = builtins.readFile ./content.md;
-    staticUrl = "https://tvl.fyi/static";
     extraFooter = "\n|\n © ООО ТВЛ";
 
     # TODO(tazjin): The `.tvl-logo` thing can probably go in the shared CSS.
diff --git a/web/atward/indexHtml/default.nix b/web/atward/indexHtml/default.nix
index ebe516876360..31ced8009641 100644
--- a/web/atward/indexHtml/default.nix
+++ b/web/atward/indexHtml/default.nix
@@ -2,7 +2,6 @@
 
 depot.web.tvl.template {
   title = "atward";
-  staticUrl = "https://tvl.fyi/static";
   content = ''
     atward
     ======
diff --git a/web/cgit-taz/default.nix b/web/cgit-taz/default.nix
index 105e141e4d11..a89b96fd92ba 100644
--- a/web/cgit-taz/default.nix
+++ b/web/cgit-taz/default.nix
@@ -25,7 +25,7 @@ let
     enable-follow-links=1
     enable-blame=1
     mimetype-file=${mime-types}/etc/mime.types
-    logo=https://tvl.fyi/static/tvl-animated.svg
+    logo=https://static.tvl.fyi/${depot.web.static.drvHash}/logo-animated.svg
 
     # Repository configuration
     repo.url=depot
diff --git a/web/todolist/default.nix b/web/todolist/default.nix
index e7be6e30c799..938902f31563 100644
--- a/web/todolist/default.nix
+++ b/web/todolist/default.nix
@@ -66,14 +66,16 @@ let
     <hr>
   '';
 
+  staticUrl = "https://static.tvl.fyi/${depot.web.static.drvHash}";
+
   todoPage = writeText "index.html" ''
     <!DOCTYPE html>
     <head>
       <meta charset="utf-8">
       <meta name="viewport" content="width=device-width, initial-scale=1">
       <meta name="description" content="TVL's todo-list">
-      <link rel="stylesheet" type="text/css" href="static/tvl.css" media="all">
-      <link rel="icon" type="image/webp" href="static/favicon.webp">
+      <link rel="stylesheet" type="text/css" media="all" href="${staticUrl}/tvl.css">
+      <link rel="icon" type="image/webp" href="${staticUrl}/favicon.webp">
       <title>TVL's todo-list</title>
       <style>
         svg {
@@ -106,5 +108,4 @@ let
 in runCommandNoCC "tvl-todos" {} ''
   mkdir $out
   cp ${todoPage} $out/index.html
-  ln -s ${depot.web.tvl}/static $out/static
 ''
diff --git a/web/tvl/default.nix b/web/tvl/default.nix
index 2defb7b1ba36..e918fc4a998a 100644
--- a/web/tvl/default.nix
+++ b/web/tvl/default.nix
@@ -17,7 +17,7 @@ let
 
       ----------------
 
-      <img class="tvl-logo" src="/static/tvl-animated.svg"
+      <img class="tvl-logo" src="https://static.tvl.fyi/${depot.web.static.drvHash}/logo-animated.svg"
            alt="Virus with lambda-shaped spike proteins sitting on an armchair">
 
       Welcome to **The Virus Lounge**. We're a group of people who got
@@ -80,6 +80,4 @@ let
 in runCommandNoCC "website" {} ''
   mkdir -p $out/static
   cp ${homepage} $out/index.html
-  cp ${depot.web.static}/* $out/static
-  cp ${depot.web.tvl.logo.pastelRainbow} $out/static/tvl-animated.svg
 ''