update haproxy and image from repository

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

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.cfg /usr/local/etc/haproxy/haproxy.cfg
-ADD haproxy.proxy-protocol.conf /usr/local/etc/haproxy/haproxy.proxy-protocol.cfg

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