pastila/configuration.nix

@@ -19,7 +19,6 @@ in
       ./paste.nix
       ./smtp.nix
       ./imap.nix
-      ./web-misc.nix
     ];
 
   nixpkgs.overlays = [

pastila/srv.nix

@@ -3,7 +3,6 @@
 let
   up_dir = "/srv/up";
   isomorphisme_dir = "/srv/isomorphis.me";
-  tremeg_dir = "/srv/tremeg.net";
 in
 {
   services.nginx.enable = true;
@@ -12,7 +11,7 @@ in
   # in /home. So we need to use a different location.
   users.users."up" = {
     isNormalUser = true;
-    home = "${up_dir}";
+    home = up_dir;
     # group = config.services.nginx.group;
     group = "nginx";
     createHome = true;
@@ -22,7 +21,7 @@ in
   services.nginx.virtualHosts."srv.isomorphis.me" = {
     forceSSL = true;
     enableACME = true;
-    root = "${up_dir}";
+    root = up_dir;
     locations = {
       "/" = {
         extraConfig = "autoindex on;";
@@ -40,21 +39,12 @@ in
     forceSSL = true;
     enableACME = true;
     locations."/" = {
-      root = "${isomorphisme_dir}";
-    };
-  };
-
-  services.nginx.virtualHosts."tremeg.net" = {
-    forceSSL = true;
-    enableACME = true;
-    locations."/" = {
-      root = "${tremeg_dir}";
+      root = isomorphisme_dir;
     };
   };
 
   system.activationScripts."srv-permissions" = ''
-    chown -R up:nginx ${up_dir}
-    chown -R nginx:nginx ${isomorphisme_dir}
-    chown -R nginx:nginx ${tremeg_dir}
+    chown -R up:nginx /srv/up
+    chown -R nginx:nginx /srv/isomorphis.me
   '';
 }

pastila/web-misc.nix

@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.nginx.enable = true;
-
-  services.nginx.virtualHosts."armael.gueneau.me" = {
-    globalRedirect = "gallium.inria.fr/~agueneau";
-  };
-
-  services.nginx.virtualHosts."gueneau.me" = {
-    globalRedirect = "armael.gueneau.me";
-  };
-
-}