From 178b15fcc5cce0e6d497cc6d810bc1dd5d87a5e2 Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Tue, 11 May 2021 14:54:03 +0200 Subject: [PATCH] Updated nginx --- nginx/nginx-start/nginx.template | 12 ++++++------ openshift/dev/Jenkinsfile | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nginx/nginx-start/nginx.template b/nginx/nginx-start/nginx.template index 4cbc100..1b8d0eb 100644 --- a/nginx/nginx-start/nginx.template +++ b/nginx/nginx-start/nginx.template @@ -4,11 +4,11 @@ worker_processes auto; -error_log /var/opt/rh/rh-nginx112/log/nginx/error.log; -pid /var/opt/rh/rh-nginx112/run/nginx/nginx.pid; +error_log /var/opt/rh/rh-nginx116/log/nginx/error.log; +pid /var/opt/rh/rh-nginx116/run/nginx/nginx.pid; -# Load dynamic modules. See /opt/rh/rh-nginx112/root/usr/share/doc/README.dynamic. -include /opt/rh/rh-nginx112/root/usr/share/nginx/modules/*.conf; +# Load dynamic modules. See /opt/rh/rh-nginx116/root/usr/share/doc/README.dynamic. +include /opt/rh/rh-nginx116/root/usr/share/nginx/modules/*.conf; events { worker_connections 1024; @@ -19,7 +19,7 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /var/opt/rh/rh-nginx112/log/nginx/access.log main; + access_log /var/opt/rh/rh-nginx116/log/nginx/access.log main; sendfile on; tcp_nopush on; @@ -33,7 +33,7 @@ http { gzip_comp_level 6; gzip_min_length 500; - include /etc/opt/rh/rh-nginx112/nginx/mime.types; + include /etc/opt/rh/rh-nginx116/nginx/mime.types; default_type application/octet-stream; # Load modular configuration files from the /etc/nginx/conf.d directory. diff --git a/openshift/dev/Jenkinsfile b/openshift/dev/Jenkinsfile index 51931be..81bca65 100644 --- a/openshift/dev/Jenkinsfile +++ b/openshift/dev/Jenkinsfile @@ -101,8 +101,8 @@ pipeline { sh ''' npm run build:pega - cp nginx/nginx.conf ${NGINX_PATH} - #cp -r nginx/* ${NGINX_PATH} + #cp nginx/nginx.conf ${NGINX_PATH} + cp -r nginx/* ${NGINX_PATH} ''' echo '### Application built! ###'