From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 20 Aug 2015 07:06:40 +0000 (+0200)
Subject: Get rid of search replication stunnel
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ac0a4f6fbe55ce6b2eba7ded7ce573922a240d74;p=mirror%2Fdsa-puppet.git

Get rid of search replication stunnel

It interacts badly with how xapian does network.  In particular, when
the server closes the connection, stunnel does too, not sending to the
client any remaining data.
---

diff --git a/modules/roles/manifests/search_backend.pp b/modules/roles/manifests/search_backend.pp
index 3b14a675b..cc3650467 100644
--- a/modules/roles/manifests/search_backend.pp
+++ b/modules/roles/manifests/search_backend.pp
@@ -1,6 +1,3 @@
 class roles::search_backend {
-	stunnel4::server { 'searchsync':
-		accept      => '17010',
-		connect     => 7010,
-	}
+
 }
diff --git a/modules/roles/manifests/search_frontend.pp b/modules/roles/manifests/search_frontend.pp
index 0b37015b8..a790cac1d 100644
--- a/modules/roles/manifests/search_frontend.pp
+++ b/modules/roles/manifests/search_frontend.pp
@@ -1,9 +1,4 @@
 class roles::search_frontend {
-	stunnel4::client { 'searchsync':
-		accept      => '127.0.0.1:7010',
-		connecthost => 'wolkenstein.debian.org',
-		connectport => 17010,
-	}
 	ssl::service { 'search.debian.org':
 		notify => Service['apache2'],
 	}