From e2815d8151e15ffd16079565d30098c5289aac82 Mon Sep 17 00:00:00 2001
From: Manuel Caballero <m.caballero@teradisk.com>
Date: Tue, 25 Oct 2022 17:40:12 +0200
Subject: [PATCH] update path and fix write error

---
 dd-ctl                                      | 13 ++++++++++---
 dd-waf/docker-compose-parts/haproxy.yml     |  2 +-
 dd-waf/docker-compose-parts/modsecurity.yml |  2 +-
 dd-waf/docker/modsecurity/000-default.conf  |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dd-ctl b/dd-ctl
index f392ccc..0abbbc2 100755
--- a/dd-ctl
+++ b/dd-ctl
@@ -182,6 +182,7 @@ build_compose(){
 	setconf CUSTOM_PATH "$CUSTOM_PATH" .env
 	setconf BUILD_APPS_ROOT_PATH "$CUSTOM_PATH/dd-apps" .env
 	setconf BUILD_SSO_ROOT_PATH "$CUSTOM_PATH/dd-sso" .env
+	setconf BUILD_WAF_ROOT_PATH "$CUSTOM_PATH/dd-waf" .env
 	## Prepare apps environment
 	ln -sf "${CUSTOM_PATH}/.env" dd-apps/.env
 	ln -sf "${CUSTOM_PATH}/.env" dd-apps/docker/postgresql && \
@@ -195,6 +196,10 @@ build_compose(){
 	ln -sf "${CUSTOM_PATH}/.env" dd-sso/.env
 	ln -sf "${CUSTOM_PATH}/.env" dd-sso/docker-compose-parts/.env
 
+	## Prepare waf environment
+	ln -sf "${CUSTOM_PATH}/.env" dd-waf/.env
+	ln -sf "${CUSTOM_PATH}/.env" dd-waf/docker-compose-parts/.env
+
 	# Clean up older custom data
 	rm -rf custom/system/keycloak-themes
 	rmdir custom/system 2>/dev/null || true
@@ -206,15 +211,17 @@ build_compose(){
 	fi
 
 	# Build compose ymls
-	docker-compose	-f dd-sso/docker-compose-parts/$BEHIND \
+	docker-compose	\
 	    -f dd-waf/docker-compose-parts/haproxy.yml \
-	    -f dd-waf/docker-compose-parts/modsecurity.yml \
+      -f dd-waf/docker-compose-parts/modsecurity.yml \
+                  \
+      -f dd-sso/docker-compose-parts/$BEHIND \
 			-f dd-sso/docker-compose-parts/api.yml \
 			-f dd-sso/docker-compose-parts/keycloak.yml \
 			-f dd-sso/docker-compose-parts/avatars.yml \
 			-f dd-apps/docker/postgresql/postgresql.yml \
 			-f dd-sso/docker-compose-parts/admin.yml \
-								\
+								  \
 			-f dd-apps/docker/moodle/moodle.yml \
 			-f dd-apps/docker/nextcloud/nextcloud.yml \
 			-f dd-apps/docker/wordpress/wordpress.yml \
diff --git a/dd-waf/docker-compose-parts/haproxy.yml b/dd-waf/docker-compose-parts/haproxy.yml
index 7b3fa2f..309b958 100644
--- a/dd-waf/docker-compose-parts/haproxy.yml
+++ b/dd-waf/docker-compose-parts/haproxy.yml
@@ -4,7 +4,7 @@ services:
     build:
       args:
         HAPROXY_IMG: ${HAPROXY_IMG-haproxy:2.4.12-alpine3.15}
-      context: ${BUILD_SSO_ROOT_PATH}/docker/haproxy-waf
+      context: ${BUILD_WAF_ROOT_PATH}/docker/haproxy
       dockerfile: Dockerfile
       target: production
     container_name: dd-waf-haproxy
diff --git a/dd-waf/docker-compose-parts/modsecurity.yml b/dd-waf/docker-compose-parts/modsecurity.yml
index 1b9da12..319ce5b 100644
--- a/dd-waf/docker-compose-parts/modsecurity.yml
+++ b/dd-waf/docker-compose-parts/modsecurity.yml
@@ -2,7 +2,7 @@ version: '3.7'
 services:
   dd-waf-apache:
     build:
-      context: ${BUILD_SSO_ROOT_PATH}/docker/modsecurity
+      context: ${BUILD_WAF_ROOT_PATH}/docker/modsecurity
       dockerfile: Dockerfile
       target: production
     container_name: dd-waf-apache
diff --git a/dd-waf/docker/modsecurity/000-default.conf b/dd-waf/docker/modsecurity/000-default.conf
index 32f9c26..d6fc48a 100644
--- a/dd-waf/docker/modsecurity/000-default.conf
+++ b/dd-waf/docker/modsecurity/000-default.conf
@@ -4,7 +4,7 @@
 	ServerAdmin webmaster@localhost
 	DocumentRoot /var/www/html
 	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined7
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
 	ProxyPreserveHost On
   ProxyRequests off