From 4aa3368c4354b3f5b8d6e5e7cf4c45f22dd50618 Mon Sep 17 00:00:00 2001 From: Adrian Date: Mon, 14 Dec 2015 01:08:09 +0100 Subject: [PATCH] Nginx config: Replace CGI host with includable config `SCRIPT_NAME` was removed because `alias` sets `$request_filename` to the full path. Let's hope it works... --- conf/nginx/inc/cgi-bin | 4 ++++ conf/nginx/sites-available/cgi | 15 --------------- conf/nginx/sites-available/example | 23 ++++++++++++++++++----- 3 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 conf/nginx/inc/cgi-bin delete mode 100644 conf/nginx/sites-available/cgi diff --git a/conf/nginx/inc/cgi-bin b/conf/nginx/inc/cgi-bin new file mode 100644 index 0000000..17797e2 --- /dev/null +++ b/conf/nginx/inc/cgi-bin @@ -0,0 +1,4 @@ +fastcgi_pass unix:/run/php5-fpm.sock; +include fastcgi_params; +fastcgi_param SCRIPT_FILENAME /etc/nginx/cgi-bin.php; +fastcgi_param X_SCRIPT_FILENAME $request_filename; diff --git a/conf/nginx/sites-available/cgi b/conf/nginx/sites-available/cgi deleted file mode 100644 index 0161c1e..0000000 --- a/conf/nginx/sites-available/cgi +++ /dev/null @@ -1,15 +0,0 @@ -server { - listen 127.0.0.1:80; - - root /usr/local/share/cgi-bin; - - location ~ \.(cgi|pl|py|rb|sh)$ { - fastcgi_pass unix:/run/php-fpm.sock; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME /etc/nginx/cgi-bin.php; - fastcgi_param SCRIPT_NAME /cgi-bin.php; - fastcgi_param X_SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param X_SCRIPT_NAME $fastcgi_script_name; - fastcgi_param SERVER_NAME $http_host; - } -} diff --git a/conf/nginx/sites-available/example b/conf/nginx/sites-available/example index 671d8fe..231025a 100644 --- a/conf/nginx/sites-available/example +++ b/conf/nginx/sites-available/example @@ -8,15 +8,28 @@ server { root /usr/share/nginx/html; # redirect server error pages to the static page /50x.html - # + error_page 500 502 503 504 /50x.html; - location = /50x.html { - # internal redirect - } + + # PHP processing location ~ \.php$ { - fastcgi_pass unix:/run/php-fpm.sock; + fastcgi_pass unix:/run/php5-fpm.sock; include fastcgi.conf; fastcgi_intercept_errors on; } + + # AWstats + + location /awstats { + # You may want to secure this location by appending a random string + alias /usr/local/awstats/wwwroot/cgi-bin; + access_log off; + include inc/cgi-bin; + } + + location /awstatsicons { + alias /usr/local/awstats/wwwroot/icon; + access_log off; + } }