From 56078da9c74a558eb63e103f79fa0e6deca35471 Mon Sep 17 00:00:00 2001
From: niten <niten@fudo.org>
Date: Wed, 11 Oct 2023 23:00:28 -0700
Subject: [PATCH] Apparently solr is right in the base dir?

---
 dovecot.nix     | 2 +-
 mail-server.nix | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dovecot.nix b/dovecot.nix
index e145908..2773761 100644
--- a/dovecot.nix
+++ b/dovecot.nix
@@ -237,7 +237,7 @@ in {
           serviceConfig = {
             ExecStart = "${pkgs.curl}/bin/curl http://${cfg.solr.host}:${
                 toString cfg.solr.port
-              }/solr/dovecot/update?${params}";
+              }/?${params}";
             PrivateDevices = true;
             PrivateTmp = true;
             PrivateMounts = true;
diff --git a/mail-server.nix b/mail-server.nix
index 31c98e3..acc1843 100644
--- a/mail-server.nix
+++ b/mail-server.nix
@@ -203,9 +203,6 @@ in {
       };
     };
 
-    # FIXME: verify solr then kill this
-    networking.firewall.allowedTCPPorts = [ 8983 ];
-
     fudo.secrets.host-secrets."${hostname}" = {
       mailLdapProxyEnv = {
         source-file = pkgs.writeText "ldap-proxy.env" ''
@@ -405,7 +402,6 @@ in {
             networks = [ "solr_network" ];
             volumes =
               [ "${cfg.state-directory}/solr:/opt/solr/server/solr/dovecot" ];
-            ports = [ "8983:8983" ];
           };
           antispam = {
             service = {