summary refs log tree commit diff
path: root/modules/www
diff options
context:
space:
mode:
Diffstat (limited to 'modules/www')
-rw-r--r--modules/www/default.nix20
-rw-r--r--modules/www/tailnet.nix3
2 files changed, 17 insertions, 6 deletions
diff --git a/modules/www/default.nix b/modules/www/default.nix
index c82a00d..e2f07d6 100644
--- a/modules/www/default.nix
+++ b/modules/www/default.nix
@@ -1,7 +1,18 @@
-{ me, ... }:
+{ me, pkgs, util, ... }:
 
 let
   rnrdUrl = if me.is.renard then "rnrd.eu" else "${me.name}.rnrd.eu";
+
+  base-index = pkgs.substituteAll {
+    src = ../../assets/base.html;
+    env.me = util.titleCase me.name;
+  };
+
+  base = pkgs.linkFarm "www-base" {
+    "index.html" = base-index;
+    "favicon.png" = ../../assets/favicon.png;
+  };
+
 in
 {
   imports = [ ./tailnet.nix ];
@@ -43,11 +54,10 @@ in
     '';
 
     virtualHosts = {
-      default = {
+      base = {
         default = true;
-      };
-      ${rnrdUrl} = {
-        root = "/var/www/html";
+        serverName = rnrdUrl;
+        root = base;
         forceSSL = true;
         enableACME = true;
         extraConfig = ''
diff --git a/modules/www/tailnet.nix b/modules/www/tailnet.nix
index df70a55..8ef50cc 100644
--- a/modules/www/tailnet.nix
+++ b/modules/www/tailnet.nix
@@ -1,5 +1,6 @@
 {
   me,
+  config,
   lib,
   pkgs,
   ...
@@ -80,7 +81,7 @@ in
     listenAddresses = [ me.tailscale.ip ];
     # point to the default page, for now!
     locations."/" = {
-      alias = "/var/www/html/";
+      alias = "${config.services.nginx.virtualHosts.base.root}/";
     };
     extraConfig = ''
       access_log /var/log/nginx/tailnet.access.log json_combined;