summary refs log tree commit diff
path: root/host
diff options
context:
space:
mode:
authorRory&::Emma <root@rory.gay>2024-02-02 10:10:46 +0000
committerRory&::Emma <root@rory.gay>2024-02-02 10:10:53 +0000
commit999f8987bf5c94a4bc2dcda9d33fd28fe3524699 (patch)
treee931623f53fde1e59724954c9be268a05b99ccda /host
parentUpdate from desktop changes (diff)
downloadRory-Open-Architecture-999f8987bf5c94a4bc2dcda9d33fd28fe3524699.tar.xz
Update from server
Diffstat (limited to 'host')
-rwxr-xr-xhost/Rory-nginx/services/matrix/conduit.nix13
-rwxr-xr-xhost/Rory-nginx/services/nginx/rory.gay/matrix.nix6
2 files changed, 10 insertions, 9 deletions
diff --git a/host/Rory-nginx/services/matrix/conduit.nix b/host/Rory-nginx/services/matrix/conduit.nix
index 95e5d40..f98a4e6 100755
--- a/host/Rory-nginx/services/matrix/conduit.nix
+++ b/host/Rory-nginx/services/matrix/conduit.nix
@@ -17,11 +17,11 @@
     
       allow_device_name_federation = true;
       enable_lightning_bolt = true;
-      allow_local_presence = true;
-      allow_incoming_presence = true;
-      allow_outgoing_presence = true;
-      presence_idle_timeout_s = 60;
-      presence_offline_timeout_s = 180;
+      #allow_local_presence = true;
+      #allow_incoming_presence = true;
+      #allow_outgoing_presence = true;
+      #presence_idle_timeout_s = 60;
+      #presence_offline_timeout_s = 180;
 
 
       max_concurrent_requests = 1000;
@@ -31,7 +31,8 @@
       allow_check_for_updates = false;
       allow_registration = false;
 
-      log = "info,state_res=info";
+      #log = "info,state_res=info";
+      #log = "debug";
     };
   };
   systemd.services.matrix-conduit-reg-token = {
diff --git a/host/Rory-nginx/services/nginx/rory.gay/matrix.nix b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix
index c7b3e5d..7af0222 100755
--- a/host/Rory-nginx/services/nginx/rory.gay/matrix.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix
@@ -26,9 +26,9 @@
 	locations."~ ^/_matrix/client/(r0|v3)/sync$" = {
 		proxyPass = "http://generic_workers_upstream$request_uri";
                 extraConfig = ''
-                     proxy_read_timeout 300;
-                     proxy_connect_timeout 300;
-                     proxy_send_timeout 300; 
+                     proxy_read_timeout 3600;
+                     proxy_connect_timeout 3600;
+                     proxy_send_timeout 3600; 
                   '';
 	};
 	locations."~ ^/_matrix/client/(api/v1|r0|v3)/events$" = {