EDUCATIC
/
digitaldemocratic
mirror of https://gitlab.com/digitaldemocratic/digitaldemocratic
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update path and fix write error

GON-3874-DD-moodle
Manuel Caballero 2022-10-25 17:40:12 +02:00 committed by Evilham
parent 1375f4c102
commit e2815d8151
No known key found for this signature in database
GPG Key ID: AE3EE30D970886BF
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dd-ctl
View File

@ -182,6 +182,7 @@ build_compose(){
setconf CUSTOM_PATH "$CUSTOM_PATH" .env setconf CUSTOM_PATH "$CUSTOM_PATH" .env
setconf BUILD_APPS_ROOT_PATH "$CUSTOM_PATH/dd-apps" .env setconf BUILD_APPS_ROOT_PATH "$CUSTOM_PATH/dd-apps" .env
setconf BUILD_SSO_ROOT_PATH "$CUSTOM_PATH/dd-sso" .env setconf BUILD_SSO_ROOT_PATH "$CUSTOM_PATH/dd-sso" .env
setconf BUILD_WAF_ROOT_PATH "$CUSTOM_PATH/dd-waf" .env
## Prepare apps environment ## Prepare apps environment
ln -sf "${CUSTOM_PATH}/.env" dd-apps/.env ln -sf "${CUSTOM_PATH}/.env" dd-apps/.env
ln -sf "${CUSTOM_PATH}/.env" dd-apps/docker/postgresql && \ 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/.env
ln -sf "${CUSTOM_PATH}/.env" dd-sso/docker-compose-parts/.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 # Clean up older custom data
rm -rf custom/system/keycloak-themes rm -rf custom/system/keycloak-themes
rmdir custom/system 2>/dev/null || true rmdir custom/system 2>/dev/null || true
@ -206,9 +211,11 @@ build_compose(){
fi fi
# Build compose ymls # 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/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/api.yml \
-f dd-sso/docker-compose-parts/keycloak.yml \ -f dd-sso/docker-compose-parts/keycloak.yml \
-f dd-sso/docker-compose-parts/avatars.yml \ -f dd-sso/docker-compose-parts/avatars.yml \

2
dd-waf/docker-compose-parts/haproxy.yml
View File

@ -4,7 +4,7 @@ services:
build: build:
args: args:
HAPROXY_IMG: ${HAPROXY_IMG-haproxy:2.4.12-alpine3.15} 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 dockerfile: Dockerfile
target: production target: production
container_name: dd-waf-haproxy container_name: dd-waf-haproxy

2
dd-waf/docker-compose-parts/modsecurity.yml
View File

@ -2,7 +2,7 @@ version: '3.7'
services: services:
dd-waf-apache: dd-waf-apache:
build: build:
context: ${BUILD_SSO_ROOT_PATH}/docker/modsecurity context: ${BUILD_WAF_ROOT_PATH}/docker/modsecurity
dockerfile: Dockerfile dockerfile: Dockerfile
target: production target: production
container_name: dd-waf-apache container_name: dd-waf-apache

2
dd-waf/docker/modsecurity/000-default.conf
View File

@ -4,7 +4,7 @@
ServerAdmin webmaster@localhost ServerAdmin webmaster@localhost
DocumentRoot /var/www/html DocumentRoot /var/www/html
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined7 CustomLog ${APACHE_LOG_DIR}/access.log combined
ProxyPreserveHost On ProxyPreserveHost On
ProxyRequests off ProxyRequests off