summary refs log tree commit diff
path: root/host/Rory-nginx/services/nginx/nginx.nix
diff options
context:
space:
mode:
Diffstat (limited to 'host/Rory-nginx/services/nginx/nginx.nix')
-rwxr-xr-xhost/Rory-nginx/services/nginx/nginx.nix8
1 files changed, 1 insertions, 7 deletions
diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix
index 0b53a28..d210fb1 100755
--- a/host/Rory-nginx/services/nginx/nginx.nix
+++ b/host/Rory-nginx/services/nginx/nginx.nix
@@ -41,7 +41,6 @@ in
         log_format combined_vhosts '$remote_addr - $remote_user [$time_local] {host="$host",server_name="$server_name"} "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"';
         access_log /var/log/nginx/access.log combined_vhosts;
       '';
-      upstreams = import ./matrix-upstreams.nix;
       additionalModules = with pkgs.nginxModules; [ moreheaders ];
       virtualHosts = {
         "boorunav.com" = serveDir { path = "/data/nginx/html_boorunav"; };
@@ -63,7 +62,6 @@ in
         "search.thearcanebrony.net" = import ./thearcanebrony.net/search.nix;
 
         "rory.gay" = import ./rory.gay/root.nix;
-        #"rory.boo" = import ./rory.gay/root.nix;
         "lfs.rory.gay" = serveDir { path = "/data/nginx/html_lfs"; };
 
         "awooradio.thearcanebrony.net" = import ./thearcanebrony.net/awooradio.nix;
@@ -73,7 +71,6 @@ in
         #matrix...
         "conduit.rory.gay" = import ./rory.gay/conduit.nix;
         "matrix.rory.gay" = import ./rory.gay/matrix.nix;
-        "matrix-rory-gay.localhost" = import ./localhost/matrix-rory-gay.nix;
         "pcpoc.rory.gay" = import ./rory.gay/pcpoc.nix;
         "matrixunittests.rory.gay" = import ./rory.gay/matrixunittests.nix;
         "conduit.matrixunittests.rory.gay" = import ./rory.gay/conduit.matrixunittests.nix;
@@ -109,8 +106,5 @@ in
   security.acme.acceptTerms = true;
   security.acme.defaults.email = "root@thearcanebrony.net";
 
-  environment.systemPackages = with pkgs; [
-    #gitfs
-  ];
-
+  networking.hosts."127.0.0.1" = builtins.attrNames config.services.nginx.virtualHosts;
 }