diff --git a/compose/.env b/compose/.env index 7c42a0b3..27d31cbe 100644 --- a/compose/.env +++ b/compose/.env @@ -5,5 +5,5 @@ WEBDAV_IMAGE=italiangrid/storm-webdav-centos7 WEBDAV_IMAGE_TAG=latest TS_IMAGE=indigoiam/robot-framework TS_IMAGE_TAG=latest -NGINX_IMAGE=storm2/ngx-voms +NGINX_IMAGE=baltig.infn.it:4567/cnafsd/ngx_http_voms_module/nginx-httpg-voms NGINX_IMAGE_TAG=latest \ No newline at end of file diff --git a/compose/assets/nginx/nginx.conf b/compose/assets/nginx/nginx.conf index 5b77bc4f..b9d5426d 100644 --- a/compose/assets/nginx/nginx.conf +++ b/compose/assets/nginx/nginx.conf @@ -1,20 +1,16 @@ -user build; -worker_processes 1; - -env OPENSSL_ALLOW_PROXY_CERTS=1; env X509_VOMS_DIR=/vomsdir; -error_log /home/build/local/openresty/nginx/logs/error.log warn; - events { worker_connections 1024; } http { - include /home/build/local/openresty/nginx/conf/mime.types; + include mime.types; default_type application/octet-stream; + resolver 127.0.0.11 ipv6=off; + log_format storm '$time_iso8601 [$request_id] $remote_addr - $remote_user "$request" <$upstream_response_time> ' '$ssl_protocol/$ssl_cipher ' '"$ssl_client_s_dn" ' @@ -22,15 +18,14 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /home/build/local/openresty/nginx/logs/access.log storm; + access_log /var/log/nginx/access.lo storm; sendfile on; #tcp_nopush on; keepalive_timeout 65; - #gzip on; - client_max_body_size 10000m; + include /etc/nginx/conf.d/*.conf; } diff --git a/compose/assets/nginx/srm.conf b/compose/assets/nginx/srm.conf index a93f646e..028dd238 100644 --- a/compose/assets/nginx/srm.conf +++ b/compose/assets/nginx/srm.conf @@ -1,11 +1,9 @@ server { root /tmp/storage; - error_log /home/build/local/openresty/nginx/logs/error.log info; - access_log /home/build/local/openresty/nginx/logs/access.log storm; listen 443 ssl; - server_name storm-alias.example; + server_name storm.test.example; ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 0aa59c14..ab4e6a69 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -85,7 +85,7 @@ services: - IAM_ACCESS_TOKEN=AT - TZ=UTC - DAV_HOST=storm.test.example - - REMOTE_DAV_HOST=storm-alias.example + - REMOTE_DAV_HOST=storm.test.example - REMOTE_DAVS_PORT=443 depends_on: @@ -111,7 +111,7 @@ services: nginx: image: ${NGINX_IMAGE}:${NGINX_IMAGE_TAG} - hostname: storm-alias.example + hostname: storm.test.example ports: - "9553:443" @@ -137,4 +137,4 @@ services: networks: default: aliases: - - storm-alias.example + - storm.test.example