Update nginx configs

diff --git a/testing/fastcgi-approach/-etc-nginx/fastcgi_params b/testing/fastcgi-approach/-etc-nginx/fastcgi_params
new file mode 100644 (file)
index 0000000..ec905ca
--- /dev/null
+++ b/testing/fastcgi-approach/-etc-nginx/fastcgi_params
@@ -0,0 +1,26 @@
+fastcgi_param  QUERY_STRING            $query_string;
+fastcgi_param  REQUEST_METHOD          $request_method;
+fastcgi_param  CONTENT_TYPE            $content_type;
+fastcgi_param  CONTENT_LENGTH          $content_length;
+
+fastcgi_param  SCRIPT_FILENAME         $request_filename;
+fastcgi_param  SCRIPT_NAME             $fastcgi_script_name;
+fastcgi_param  REQUEST_URI             $request_uri;
+fastcgi_param  DOCUMENT_URI            $document_uri;
+fastcgi_param  DOCUMENT_ROOT           $document_root;
+fastcgi_param  SERVER_PROTOCOL         $server_protocol;
+
+fastcgi_param  GATEWAY_INTERFACE       CGI/1.1;
+fastcgi_param  SERVER_SOFTWARE         nginx/$nginx_version;
+fastcgi_param  SERVER_HOSTNAME         mctxsoft;
+
+fastcgi_param  REMOTE_ADDR             $remote_addr;
+fastcgi_param  REMOTE_PORT             $remote_port;
+fastcgi_param  SERVER_ADDR             $server_addr;
+fastcgi_param  SERVER_PORT             $server_port;
+fastcgi_param  SERVER_NAME             $server_name;
+
+fastcgi_param  HTTPS                   $https;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param  REDIRECT_STATUS         200;

diff --git a/testing/fastcgi-approach/-etc-nginx/sites-enabled/default b/testing/fastcgi-approach/-etc-nginx/sites-enabled/default
new file mode 100644 (file)
index 0000000..b11b2e4
--- /dev/null
+++ b/testing/fastcgi-approach/-etc-nginx/sites-enabled/default
@@ -0,0 +1,126 @@
+# You may add here your
+# server {
+#      ...
+# }
+# statements for each of your virtual hosts to this file
+
+##
+# You should look at the following URL's in order to grasp a solid understanding
+# of Nginx configuration files in order to fully unleash the power of Nginx.
+# http://wiki.nginx.org/Pitfalls
+# http://wiki.nginx.org/QuickStart
+# http://wiki.nginx.org/Configuration
+#
+# Generally, you will want to move this file somewhere, and start with a clean
+# file but keep this around for reference. Or just disable in sites-enabled.
+#
+# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
+##
+
+server {
+       listen 80;
+       listen [::]:80 default_server ipv6only=on;
+
+       root /usr/share/nginx/html;
+       index index.php index.html index.htm;
+
+       # Make site accessible from http://localhost/
+       server_name localhost;
+
+       location / {
+               # First attempt to serve request as file, then
+               # as directory, then fall back to displaying a 404.
+               try_files $uri $uri/ =404;
+               # Uncomment to enable naxsi on this location
+               # include /etc/nginx/naxsi.rules
+       }
+
+       location /doc/ {
+               alias /usr/share/doc/;
+               autoindex on;
+               allow 127.0.0.1;
+               allow ::1;
+               deny all;
+       }
+
+       # Only for nginx-naxsi used with nginx-naxsi-ui : process denied requests
+       #location /RequestDenied {
+       #       proxy_pass http://127.0.0.1:8080;    
+       #}
+
+       #error_page 404 /404.html;
+
+       # redirect server error pages to the static page /50x.html
+       #
+       #error_page 500 502 503 504 /50x.html;
+       #location = /50x.html {
+       #       root /usr/share/nginx/html;
+       #}
+
+       # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+       #
+       location ~ \.php$ {
+               fastcgi_split_path_info ^(.+\.php)(/.+)$;
+       #       # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
+       #
+       #       # With php5-cgi alone:
+       #       fastcgi_pass 127.0.0.1:9000;
+       #       # With php5-fpm:
+               fastcgi_pass unix:/var/run/php5-fpm.sock;
+               fastcgi_index index.php;
+               include fastcgi_params;
+       }
+
+       # deny access to .htaccess files, if Apache's document root
+       # concurs with nginx's one
+       #
+       location ~ /\.ht {
+               deny all;
+       }
+
+        location ~ ^/api/?([^?]*) {
+                fastcgi_pass 127.0.0.1:9005;
+                fastcgi_param DOCUMENT_URI_LOCAL $1;
+                include fastcgi_params;
+        }
+}
+
+
+# another virtual host using mix of IP-, name-, and port-based configuration
+#
+#server {
+#      listen 8000;
+#      listen somename:8080;
+#      server_name somename alias another.alias;
+#      root html;
+#      index index.html index.htm;
+#
+#      location / {
+#              try_files $uri $uri/ =404;
+#      }
+#}
+
+
+# HTTPS server
+#
+#server {
+#      listen 443;
+#      server_name localhost;
+#
+#      root html;
+#      index index.html index.htm;
+#
+#      ssl on;
+#      ssl_certificate cert.pem;
+#      ssl_certificate_key cert.key;
+#
+#      ssl_session_timeout 5m;
+#
+#      ssl_protocols SSLv3 TLSv1;
+#      ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
+#      ssl_prefer_server_ciphers on;
+#
+#      location / {
+#              try_files $uri $uri/ =404;
+#      }
+#}

diff --git a/testing/fastcgi-approach/README.txt b/testing/fastcgi-approach/README.txt
index 29cfd2c..159bbc6 100644 (file)
--- a/testing/fastcgi-approach/README.txt
+++ b/testing/fastcgi-approach/README.txt
@@ -7,8 +7,8 @@ Setup:
 Compile fastcgi_test.c with: (the libfcgi-dev package must be installed)
 gcc fastcgi_test.c -lfcgi -o fastcgi_test
 
-Configure nginx to pass all requests to the address /cgi/ to the application:
-Edit /etc/nginx/sites-enabled/default by adding the contents of nginx_server_config.txt
+Configure nginx:
+Use the config files in -etc-nginx (representing files in /etc/nginx)
 
 Restart nginx:
 /etc/init.d/nginx restart

diff --git a/testing/fastcgi-approach/nginx_server_config.txt b/testing/fastcgi-approach/nginx_server_config.txt
deleted file mode 100644 (file)
index 76be0f0..0000000
--- a/testing/fastcgi-approach/nginx_server_config.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-        #Custom cgi
-        location ~ ^/api/?([^?]*) {
-                fastcgi_pass 127.0.0.1:9005;
-                fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
-                fastcgi_param  SERVER_HOSTNAME    mctxsoft;
-                fastcgi_param  SERVER_SOFTWARE    nginx;
-
-                #Regex removed /cgi/ part, and any args
-                fastcgi_param  DOCUMENT_URI_LOCAL  $1;
-                fastcgi_param  QUERY_STRING       $query_string;
-
-                #Unused for now
-                fastcgi_param  REQUEST_METHOD     $request_method;
-                fastcgi_param  CONTENT_TYPE       $content_type;
-                fastcgi_param  CONTENT_LENGTH     $content_length;
-                fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script$
-                fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
-                fastcgi_param  REQUEST_URI        $request_uri;
-                fastcgi_param  DOCUMENT_URI       $document_uri;
-                fastcgi_param  DOCUMENT_ROOT      $document_root;
-                fastcgi_param  SERVER_PROTOCOL    $server_protocol;
-                fastcgi_param  REMOTE_ADDR        $remote_addr;
-                fastcgi_param  REMOTE_PORT        $remote_port;
-                fastcgi_param  SERVER_ADDR        $server_addr;
-                fastcgi_param  SERVER_PORT        $server_port;
-                fastcgi_param  SERVER_NAME        $server_name;
-        }