From b98b8dedd94b9a63ccfd0e929de653abd2bccbed Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@odoo.com>
Date: Mon, 30 Jul 2018 12:11:27 +0200
Subject: [PATCH] [IMP] runbot: make nginx server_name more specific

Avoids overly generic vhost declaration, and makes config easier to
understand.

We only want to allow such hosts:
    <build_dest>.runbotX.odoo.com
    <build_dest>-<db_name_extension>.runbotX.odoo.com

Where <db_name_extension> is usually "all" or "base".
---
 runbot/templates/nginx.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runbot/templates/nginx.xml b/runbot/templates/nginx.xml
index f0a7f67b..d4f41f72 100644
--- a/runbot/templates/nginx.xml
+++ b/runbot/templates/nginx.xml
@@ -47,7 +47,7 @@ server {
 <t t-foreach="builds" t-as="build">
 server {
     listen 8080;
-    server_name ~^<t t-raw="re_escape(build.dest)"/>[-.].*$;
+    server_name ~^<t t-raw="re_escape(build.dest)"/>(-[a-z0-9]+)?\.<t t-raw="re_escape(fqdn)"/>$;
     location / { proxy_pass http://127.0.0.1:<t t-esc="build.port"/>; }
     location /longpolling { proxy_pass http://127.0.0.1:<t t-esc="build.port + 1"/>; }
 }