diff --git a/_example/etc/handler-nginx.conf b/_example/etc/handler-nginx.conf index 3e13378c1..df3fa8551 100644 --- a/_example/etc/handler-nginx.conf +++ b/_example/etc/handler-nginx.conf @@ -41,7 +41,7 @@ server { fastcgi_pass unix:__FASTCGISOCKDIR__/llng-fastcgi.sock; fastcgi_param LLTYPE reload; - # OR TO USE uWSGI + # Or with uWSGI #include /etc/nginx/uwsgi_params; #uwsgi_pass 127.0.0.1:5000; #uwsgi_param LLTYPE reload; @@ -61,7 +61,7 @@ server { # include /etc/nginx/fastcgi_params; # fastcgi_pass unix:__FASTCGISOCKDIR__/llng-fastcgi.sock; # fastcgi_param LLTYPE status; - # # OR TO USE uWSGI + # # Or with uWSGI # #include /etc/nginx/uwsgi_params; # #uwsgi_pass 127.0.0.1:5000; # #uwsgi_param LLTYPE status; diff --git a/_example/etc/manager-nginx.conf b/_example/etc/manager-nginx.conf index 8ed46e3ad..3ba01f906 100644 --- a/_example/etc/manager-nginx.conf +++ b/_example/etc/manager-nginx.conf @@ -29,7 +29,7 @@ server { fastcgi_split_path_info ^(.*\.psgi)(/.*)$; fastcgi_param PATH_INFO $fastcgi_path_info; - # OR TO USE uWSGI + # Or with uWSGI #include /etc/nginx/uwsgi_params; #uwsgi_pass 127.0.0.1:5000; #uwsgi_param LLTYPE psgi; diff --git a/_example/etc/portal-nginx.conf b/_example/etc/portal-nginx.conf index d81553abc..464dcd8be 100644 --- a/_example/etc/portal-nginx.conf +++ b/_example/etc/portal-nginx.conf @@ -5,9 +5,10 @@ # ~/CN=(?[^/]+) $CN; #} -# FastCGI backend definition +# FastCGI/uWSGI backend definition upstream llng_portal_upstream { server unix:__FASTCGISOCKDIR__/llng-fastcgi.sock; + #server 127.0.0.1:5000; } server { @@ -44,9 +45,9 @@ server { # Uncomment this if you use Auth SSL: #fastcgi_param SSL_CLIENT_S_DN_CN $ssl_client_s_dn_cn; - # OR TO USE uWSGI + # Or with uWSGI #include /etc/nginx/uwsgi_params; - #uwsgi_pass 127.0.0.1:5000; + #uwsgi_pass llng_portal_upstream; #uwsgi_param LLTYPE psgi; #uwsgi_param SCRIPT_FILENAME $document_root$sc; #uwsgi_param SCRIPT_NAME $sc; @@ -56,30 +57,35 @@ server { # REST/SOAP functions for sessions management (disabled by default) location ~ ^/index.psgi/adminSessions { fastcgi_pass llng_portal_upstream; + #uwsgi_pass llng_portal_upstream; deny all; } # REST/SOAP functions for proxy auth and password reset (disabled by default) location ~ ^/index.psgi/proxy { fastcgi_pass llng_portal_upstream; + #uwsgi_pass llng_portal_upstream; deny all; } # REST/SOAP functions for sessions access (disabled by default) location ~ ^/index.psgi/sessions { fastcgi_pass llng_portal_upstream; + #uwsgi_pass llng_portal_upstream; deny all; } # REST/SOAP functions for configuration access (disabled by default) location ~ ^/index.psgi/config { fastcgi_pass llng_portal_upstream; + #uwsgi_pass llng_portal_upstream; deny all; } # REST/SOAP functions for notification insertion (disabled by default) location ~ ^/index.psgi/notification { fastcgi_pass llng_portal_upstream; + #uwsgi_pass llng_portal_upstream; deny all; } diff --git a/_example/etc/test-nginx.conf b/_example/etc/test-nginx.conf index d2c719924..b908fee35 100644 --- a/_example/etc/test-nginx.conf +++ b/_example/etc/test-nginx.conf @@ -32,14 +32,17 @@ server { #fastcgi_buffers 32 32k; - # OR TO USE uWSGI + # Or with uWSGI #include /etc/nginx/uwsgi_params; #uwsgi_pass 127.0.0.1:5000; + # Drop post datas #uwsgi_pass_request_body off; #uwsgi_param CONTENT_LENGTH ""; + # Keep original hostname #uwsgi_param HOST $http_host; + # Keep original request (LLNG server will receive /lmauth) #uwsgi_param X_ORIGINAL_URI $original_uri; - # Improve performances + ## Improve performances #uwsgi_buffer_size 32k; #uwsgi_buffers 32 32k; }