From 272096b81062d25ed443fac3875ac412c42d80af Mon Sep 17 00:00:00 2001
From: Xavier-Do <xdo@odoo.com>
Date: Tue, 7 Jun 2022 10:31:09 +0200
Subject: [PATCH] [REM] runbot: remove non nginx support

Some non tested code was making running build available without
an nginx config (using port and local address instead of using a proper
dns/nginx config).
Removing this part to reduce complexity.
---
 runbot/models/build.py               | 8 +-------
 runbot/models/build_config.py        | 9 +++------
 runbot/models/res_config_settings.py | 1 -
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/runbot/models/build.py b/runbot/models/build.py
index 9a6ebba5..c25bd5a7 100644
--- a/runbot/models/build.py
+++ b/runbot/models/build.py
@@ -387,14 +387,8 @@ class BuildResult(models.Model):
 
     @api.depends('port', 'dest', 'host')
     def _compute_domain(self):
-        icp = self.env['ir.config_parameter'].sudo()
-        nginx = icp.get_param('runbot.runbot_nginx', False)  # or just force nginx?
-        domain = icp.get_param('runbot.runbot_domain', fqdn())
         for build in self:
-            if nginx:
-                build.domain = "%s.%s" % (build.dest, build.host)
-            else:
-                build.domain = "%s:%s" % (domain, build.port)
+            build.domain = "%s.%s" % (build.dest, build.host)
 
     @api.depends_context('batch')
     def _compute_build_url(self):
diff --git a/runbot/models/build_config.py b/runbot/models/build_config.py
index 67729468..cdd4b1a7 100644
--- a/runbot/models/build_config.py
+++ b/runbot/models/build_config.py
@@ -345,15 +345,12 @@ class ConfigStep(models.Model):
         cmd += ['-d', '%s-%s' % (build.dest, db_name)]
 
         icp = self.env['ir.config_parameter'].sudo()
-        nginx = icp.get_param('runbot.runbot_nginx', True)
-        if grep(build._server("tools/config.py"), "proxy-mode") and nginx:
+        if grep(build._server("tools/config.py"), "proxy-mode"):
             cmd += ["--proxy-mode"]
 
         if grep(build._server("tools/config.py"), "db-filter"):
-            if nginx:
-                cmd += ['--db-filter', '%d.*$']
-            else:
-                cmd += ['--db-filter', '%s.*$' % build.dest]
+            cmd += ['--db-filter', '%d.*$']
+
         smtp_host = docker_get_gateway_ip()
         if smtp_host:
             cmd += ['--smtp', smtp_host]
diff --git a/runbot/models/res_config_settings.py b/runbot/models/res_config_settings.py
index 4639cda0..dbb66059 100644
--- a/runbot/models/res_config_settings.py
+++ b/runbot/models/res_config_settings.py
@@ -35,7 +35,6 @@ class ResConfigSettings(models.TransientModel):
 
     # TODO other icp
     # runbot.runbot_maxlogs 100
-    # runbot.runbot_nginx True
     # migration db
     # ln path