From: Tom Hughes <tom@compton.nu>
Date: Thu, 18 Nov 2021 19:03:08 +0000 (+0000)
Subject: Remove last remnants of streaming replication
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/c3c09b47a073b4b7a068ebcc73f70069a1d1bf5e

Remove last remnants of streaming replication
---

diff --git a/cookbooks/planet/files/default/replication-bin/streaming-replicator b/cookbooks/planet/files/default/replication-bin/streaming-replicator
deleted file mode 100644
index 7b78ae41a..000000000
--- a/cookbooks/planet/files/default/replication-bin/streaming-replicator
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# DO NOT EDIT - This file is being maintained by Chef
-
-export TZ=UTC
-
-exec >> /var/log/replication/streaming-replicator 2>&1
-
-exec /usr/local/bin/osmosis -q \
-  --replicate-apidb iterations=0 minInterval=10000 maxInterval=60000 authFile=/etc/replication/auth.conf validateSchemaVersion=false \
-  --send-replication-sequence port=8081 \
-  --write-replication workingDirectory=/var/lib/replication/streaming
diff --git a/cookbooks/planet/files/default/replication-bin/streaming-server b/cookbooks/planet/files/default/replication-bin/streaming-server
deleted file mode 100644
index 11394ae39..000000000
--- a/cookbooks/planet/files/default/replication-bin/streaming-server
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# DO NOT EDIT - This file is being maintained by Chef
-
-export TZ=UTC
-
-exec >> /var/log/replication/streaming-server 2>&1
-
-exec /usr/local/bin/osmosis -q \
-  --send-replication-data dataDirectory=/var/lib/replication/streaming port=8080 notificationPort=8081
diff --git a/cookbooks/planet/templates/default/apache.erb b/cookbooks/planet/templates/default/apache.erb
index f8bf0dc7e..8ea1698e9 100644
--- a/cookbooks/planet/templates/default/apache.erb
+++ b/cookbooks/planet/templates/default/apache.erb
@@ -26,12 +26,6 @@
                 Require all granted
         </Directory>
 
-        ProxyPass /replication/streaming http://127.0.0.1:8080
-
-        <Location /replication/steaming>
-                Require all granted
-        </Location>
-
         Redirect /pbf-experimental/	/pbf/
 
         <IfModule mod_headers.c>