baserock_frontend: Remove obsolete servers from haproxy configuration

1 files changed, 5 insertions, 36 deletions

diff --git a/baserock_frontend/haproxy.cfg b/baserock_frontend/haproxy.cfg
index f15c9a4d..c20ccfb4 100644
--- a/baserock_frontend/haproxy.cfg
+++ b/baserock_frontend/haproxy.cfg
@@ -52,9 +52,6 @@ frontend https-in
     # See <https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#7>
     # for more documentation than you ever dreamed of.
 
-    acl host_gerrit hdr(host) -m beg -i gerrit
-    use_backend baserock_gerrit_http if host_gerrit
-
     acl host_irclogs hdr(host) -m beg -i irclogs
     use_backend baserock_irclogs_http if host_irclogs
 
@@ -65,35 +62,20 @@ frontend https-in
     acl host_download hdr(host) -m beg -i download
     use_backend baserock_webserver_http if host_download
 
-    use_backend baserock_openid_provider_http if { hdr(host) -m beg -i openid }
-
     acl host_ostree hdr(host) -m beg -i ostree
     acl host_ostree hdr(host) -m beg -i cache
     use_backend baserock_ostree_http if host_ostree
 
 frontend ssh-in:
-    # FIXME: it'd be better if we could limit traffic on port 29418 to
-    # gerrit.baserock.org. There's no way of knowing from an SSH request
-    # which subdomain the user tried to connect to, so for now they can
-    # clone repos from 'ssh://openid.baserock.org:29418' and such like.
-    # For this reason it's probably worth pointing gerrit.baserock.org to
-    # a different floating IP that serves only the gerrit instance.
-    mode tcp
-    bind *:29418
-    default_backend baserock_gerrit_ssh
-
-    # Uploading artifacts can be slow; need a long timeout.
-    timeout client 12h
-
-    # Similarly, port 22200 on any instance forwards SSH to the ostree
-    # machine
+    # FIXME: it'd be better if we could limit traffic on port 22200 to
+    # ostree.baserock.org. There's no way of knowing from an SSH request
+    # which subdomain the user tried to connect to though.
     mode tcp
     bind *:22200
     default_backend baserock_ostree_ssh
 
-    # It's very annoying for 'gerrit stream-events' to have disconnection
-    # after 50 seconds!
-    timeout client 1h
+    # Uploading artifacts can be slow; need a long timeout.
+    timeout client 12h
 
 # Entries here locate each server backend.
 
@@ -103,22 +85,9 @@ backend baserock_spec_http
     # Otherwise Gitlab will just show a 404 page
     server baserock_spec baserock.gitlab.io:80
 
-backend baserock_gerrit_http
-    server baserock_gerrit 192.168.222.69:8080
-
-backend baserock_gerrit_ssh
-    mode tcp
-    server baserock_gerrit 192.168.222.69:29418
-    # It's very annoying for 'gerrit stream-events' to have disconnection
-    # after 50 seconds!
-    timeout server 1h
-
 backend baserock_irclogs_http
     server baserock_irclogs 192.168.222.74:80
 
-backend baserock_openid_provider_http
-    server baserock_openid_provider 192.168.222.144:80
-
 backend baserock_ostree_http
     server baserock_ostree 192.168.222.153:80