Skip to content

Commit

Permalink
Switch to ngx_http_voms_module
Browse files Browse the repository at this point in the history
  • Loading branch information
federicaagostini committed Oct 8, 2024
1 parent c4ef70c commit 9079c5b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 17 deletions.
2 changes: 1 addition & 1 deletion compose/.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 5 additions & 10 deletions compose/assets/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,36 +1,31 @@
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" '
'[$voms_fqans] '
'$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;
}
4 changes: 1 addition & 3 deletions compose/assets/nginx/srm.conf
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -111,7 +111,7 @@ services:

nginx:
image: ${NGINX_IMAGE}:${NGINX_IMAGE_TAG}
hostname: storm-alias.example
hostname: storm.test.example
ports:
- "9553:443"

Expand All @@ -137,4 +137,4 @@ services:
networks:
default:
aliases:
- storm-alias.example
- storm.test.example

0 comments on commit 9079c5b

Please sign in to comment.