From a98499354b3401a2eeb2282283301958dda32c05 Mon Sep 17 00:00:00 2001
From: vzikratyi-tb <65224127+vzikratyi-tb@users.noreply.github.com>
Date: Mon, 5 Apr 2021 12:43:53 +0300
Subject: [PATCH] Used thingsboard/haproxy-certbot image (#4354)

* Used thingsboard/haproxy-certbot image

* Used 1.3.0 version of thingsboard/haproxy-certbot
---
 docker/docker-compose.yml         | 2 +-
 docker/haproxy/config/haproxy.cfg | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index a051a98742..67eb3eada9 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -216,7 +216,7 @@ services:
   haproxy:
     restart: always
     container_name: "${LOAD_BALANCER_NAME}"
-    image: xalauc/haproxy-certbot:1.7.9
+    image: thingsboard/haproxy-certbot:1.3.0
     volumes:
      - ./haproxy/config:/config
      - ./haproxy/letsencrypt:/etc/letsencrypt
diff --git a/docker/haproxy/config/haproxy.cfg b/docker/haproxy/config/haproxy.cfg
index 5ff76cfdcd..2a457a0696 100644
--- a/docker/haproxy/config/haproxy.cfg
+++ b/docker/haproxy/config/haproxy.cfg
@@ -54,7 +54,7 @@ frontend http-in
 
  option forwardfor
 
- reqadd X-Forwarded-Proto:\ http
+ http-request add-header "X-Forwarded-Proto" "http"
 
  acl transport_http_acl path_beg /api/v1/
  acl letsencrypt_http_acl path_beg /.well-known/acme-challenge/
@@ -73,7 +73,7 @@ frontend https_in
 
   option forwardfor
 
-  reqadd X-Forwarded-Proto:\ https
+  http-request add-header "X-Forwarded-Proto" "https"
 
   acl transport_http_acl path_beg /api/v1/
   acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/widgets/