InfraScience
/
ansible-role-inception
23
0
Fork 0
Code Issues Pull Requests Releases Activity

the nginx configuration skips the call to pep.js.

This commit is contained in:
Andrea Dell'Amico 2021-11-04 10:54:41 +01:00
parent 87d76be578
commit f7f55cf56a
Signed by: andrea.dellamico
GPG Key ID: 147ABE6CEB9E20FF
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/nginx.conf.j2
View File

@ -10,7 +10,6 @@ http {
js_import pep.js; js_import pep.js;
js_set $authorization pep.enforce; js_set $authorization pep.enforce;
underscores_in_headers on;
proxy_cache_path /var/cache/nginx/pep keys_zone=token_responses:1m max_size=2m; proxy_cache_path /var/cache/nginx/pep keys_zone=token_responses:1m max_size=2m;
include /etc/nginx/conf.d/*.conf; include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*; include /etc/nginx/sites-enabled/*;

18
templates/nginx.default.conf.j2
View File

@ -1,3 +1,9 @@
proxy_cache_path /var/cache/nginx/pep keys_zone=token_responses:1m max_size=2m;
js_var $auth_token;
js_var $pep_credentials;
js_var $remote_user;
underscores_in_headers on;
upstream _inception-server { upstream _inception-server {
ip_hash; ip_hash;
server {{ inception_project_docker_service_name }}:{{ inception_project_server_port }}; server {{ inception_project_docker_service_name }}:{{ inception_project_server_port }};
@ -7,12 +13,11 @@ map $http_authorization $source_auth {
default ""; default "";
} }
js_var $auth_token;
js_var $pep_credentials;
server { server {
listen *:{{ pep_port }}; listen *:{{ pep_port }};
server_name {{ inception_project_docker_service_name }}; server_name {{ inception_project_docker_service_name }};
access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log{% if nginx_pep_debug_enabled %}debug{% endif %};
{% if inception_project_websockets_enabled == 'true' %} {% if inception_project_websockets_enabled == 'true' %}
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
@ -21,11 +26,6 @@ server {
location / { location / {
js_content pep.enforce; js_content pep.enforce;
proxy_request_buffering off;
proxy_buffering off; # Required for HTTP-based CLI to work over SSL
proxy_set_header Connection ""; # Clear for keepalive
proxy_set_header Host $host;
proxy_pass http://_inception-server;
} }
location @backend { location @backend {
@ -46,7 +46,7 @@ server {
proxy_pass http://_inception-server; proxy_pass http://_inception-server;
} }
location /gcube_user_info { location /gcube_user_info {
internal; internal;
gunzip on; gunzip on;
proxy_method GET; proxy_method GET;