Server changes

3 files changed, 19 insertions, 14 deletions

diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix

index 7d0903e..11f27eb 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -22,11 +22,14 @@
     ./services/nginx/nginx.nix
     #./services/jitsi.nix
     ./services/cgit.nix
-    #./services/ollama.nix
+    ./services/ollama.nix
     ./services/prometheus.nix
     
     ./services/email/root.nix
   ];
+
+
+
   users.groups.ocp = { };
   networking = {
     hostName = "Rory-nginx";
@@ -66,8 +69,11 @@
     nginxSsl = true;
   };
 
-  nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ];
-
+  nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" 
+                "dotnet-runtime-wrapped-7.0.20"
+                "dotnet-runtime-7.0.20"
+                "dotnet-sdk-7.0.20"
+              ];
   services.irqbalance.enable = true;
 
   environment.memoryAllocator.provider = "jemalloc";
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix b/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix

index fd75817..81d07e7 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix
@@ -21,7 +21,7 @@ let
       "~ ^/_matrix/federation/(v1|v2)/send_leave/"
       "~ ^/_matrix/federation/v1/make_knock/"
       "~ ^/_matrix/federation/v1/send_knock/"
-      # "~ ^/_matrix/federation/(v1|v2)/invite/" # Needs special handling, define manually
+      "~ ^/_matrix/federation/(v1|v2)/invite/" # Needs special handling, define manually
       "~ ^/_matrix/federation/(v1|v2)/query_auth/"
       "~ ^/_matrix/federation/(v1|v2)/event_auth/"
       "~ ^/_matrix/federation/v1/timestamp_to_event/"
@@ -135,13 +135,13 @@ in
         )
       );
       
-      virtualHosts."${cfg.nginxVirtualHostName}".locations."~ ^/_matrix/federation/(v1|v2)/invite/" = {
-        proxyPass = "http://${workerName}-federation";
-        extraConfig = ''
-          proxy_http_version 1.1;
-          proxy_set_header Connection "";
-        '';
-      };
+      #virtualHosts."${cfg.nginxVirtualHostName}".locations."~ ^/_matrix/federation/(v1|v2)/invite/" = {
+      #  proxyPass = "http://${workerName}-federation";
+      #  extraConfig = ''
+      #    proxy_http_version 1.1;
+      #    proxy_set_header Connection "";
+      #  '';
+      #};
     };
   };
 }
diff --git a/host/Rory-nginx/services/ollama.nix b/host/Rory-nginx/services/ollama.nix

index c9709da..b9ebe66 100755
--- a/host/Rory-nginx/services/ollama.nix
+++ b/host/Rory-nginx/services/ollama.nix
@@ -10,8 +10,7 @@
     environmentVariables = {
       OLLAMA_LLM_LIBRARY = "cpu_avx2";
     };
-    writablePaths = [ "/data/ollama/home" ];
-    listenAddress = "0.0.0.0:11434";
-    sandbox = false;
+    #listenAddress = "0.0.0.0:11434";
+    host = "0.0.0.0";
   };
 }