From 2af96ac3c0813c36ad182c15d322d81967904fb8 Mon Sep 17 00:00:00 2001
From: Manuel Caballero <info@teradisk.com>
Date: Wed, 16 Nov 2022 12:07:49 +0000
Subject: [PATCH] update haproxy and image from repository

---
 dd-waf/docker-compose-parts/modsecurity.yml         | 1 +
 dd-waf/docker/haproxy/Dockerfile                    | 6 ++----
 dd-waf/docker/haproxy/docker-entrypoint.sh          | 2 --
 dd-waf/docker/haproxy/{haproxy.conf => haproxy.cfg} | 0
 4 files changed, 3 insertions(+), 6 deletions(-)
 rename dd-waf/docker/haproxy/{haproxy.conf => haproxy.cfg} (100%)

diff --git a/dd-waf/docker-compose-parts/modsecurity.yml b/dd-waf/docker-compose-parts/modsecurity.yml
index 63b6c49..3ef1ac7 100644
--- a/dd-waf/docker-compose-parts/modsecurity.yml
+++ b/dd-waf/docker-compose-parts/modsecurity.yml
@@ -1,6 +1,7 @@
 version: '3.7'
 services:
   dd-waf-apache:
+    image: registry.dd-work.space/dd/waf-apache:${DD_BUILD:-latest}
     build:
       context: ${BUILD_WAF_ROOT_PATH}/docker/modsecurity
       dockerfile: Dockerfile
diff --git a/dd-waf/docker/haproxy/Dockerfile b/dd-waf/docker/haproxy/Dockerfile
index e8fdf86..04846d7 100644
--- a/dd-waf/docker/haproxy/Dockerfile
+++ b/dd-waf/docker/haproxy/Dockerfile
@@ -1,6 +1,4 @@
 #
-#   Copyright © 2021,2022 IsardVDI S.L.
-#
 #   This file is part of DD
 #
 #   DD is free software: you can redistribute it and/or modify
@@ -17,6 +15,7 @@
 #   along with DD. If not, see <https://www.gnu.org/licenses/>.
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
+
 ARG HAPROXY_IMG
 FROM $HAPROXY_IMG as production
 
@@ -33,5 +32,4 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s /usr/local/bin/docker-entrypoint.sh /
 RUN chmod 775 docker-entrypoint.sh
 
-ADD haproxy.conf /usr/local/etc/haproxy/haproxy.normal.cfg
-ADD haproxy.proxy-protocol.conf /usr/local/etc/haproxy/haproxy.proxy-protocol.cfg
+ADD haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
diff --git a/dd-waf/docker/haproxy/docker-entrypoint.sh b/dd-waf/docker/haproxy/docker-entrypoint.sh
index ade9bce..a3ff9e0 100644
--- a/dd-waf/docker/haproxy/docker-entrypoint.sh
+++ b/dd-waf/docker/haproxy/docker-entrypoint.sh
@@ -21,8 +21,6 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 set -e
 
-ln -sf /usr/local/etc/haproxy/${HAPROXY_CFG:-haproxy.normal.cfg} /usr/local/etc/haproxy/haproxy.cfg
-
 LETSENCRYPT_DOMAIN="$DOMAIN" letsencrypt.sh
 
 if [ ! -e "/certs/chain.pem" ]; then
diff --git a/dd-waf/docker/haproxy/haproxy.conf b/dd-waf/docker/haproxy/haproxy.cfg
similarity index 100%
rename from dd-waf/docker/haproxy/haproxy.conf
rename to dd-waf/docker/haproxy/haproxy.cfg