Browse Source

removed unnecessary code and switched 127.0.0.1 to localhost

Keith Newman 10 years ago
parent
commit
8eb3a4fed4

+ 2 - 0
frameworks/PHP/limonade/.gitignore

@@ -0,0 +1,2 @@
+vendor
+deploy/php-fpm.pid

+ 0 - 92
frameworks/PHP/limonade/deploy/nginx.conf

@@ -1,38 +1,18 @@
-#user  nobody;
 worker_processes  8;
 worker_processes  8;
 
 
-#error_log  logs/error.log;
-#error_log  logs/error.log  notice;
-#error_log  logs/error.log  info;
 error_log stderr error;
 error_log stderr error;
 
 
-#pid        logs/nginx.pid;
-
-
 events {
 events {
     worker_connections  1024;
     worker_connections  1024;
 }
 }
 
 
-
 http {
 http {
     include       /home/knewman/FrameworkBenchmarks/installs/nginx/conf/mime.types;
     include       /home/knewman/FrameworkBenchmarks/installs/nginx/conf/mime.types;
     default_type  application/octet-stream;
     default_type  application/octet-stream;
-
-    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-    #                  '$status $body_bytes_sent "$http_referer" '
-    #                  '"$http_user_agent" "$http_x_forwarded_for"';
-
-    #access_log  logs/access.log  main;
     access_log off;
     access_log off;
-
     sendfile        on;
     sendfile        on;
-    #tcp_nopush     on;
-
-    #keepalive_timeout  0;
     keepalive_timeout  65;
     keepalive_timeout  65;
 
 
-    #gzip  on;
-
     upstream fastcgi_backend {
     upstream fastcgi_backend {
         server 127.0.0.1:9001;
         server 127.0.0.1:9001;
         keepalive 32;
         keepalive 32;
@@ -42,35 +22,10 @@ http {
         listen       8080;
         listen       8080;
         server_name  localhost;
         server_name  localhost;
 
 
-        #charset koi8-r;
-
-        #access_log  logs/host.access.log  main;
-
-        #location / {
-        #    root   html;
-        #    index  index.html index.htm;
-        #}
-
-        #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   html;
-        #}
-
-        # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-        #
-        #location ~ \.php$ {
-        #    proxy_pass   http://127.0.0.1;
-        #}
-
         root /home/knewman/FrameworkBenchmarks/frameworks/PHP/limonade/;
         root /home/knewman/FrameworkBenchmarks/frameworks/PHP/limonade/;
         index  index.php;
         index  index.php;
 
 
         location / {
         location / {
-            #try_files $uri $uri/ /index.php?$uri&$args;
             try_files $uri $uri/ @rewrite;
             try_files $uri $uri/ @rewrite;
         }
         }
 
 
@@ -78,61 +33,14 @@ http {
             rewrite ^/(.*)$ /index.php?u=$1&$args;
             rewrite ^/(.*)$ /index.php?u=$1&$args;
         }
         }
 
 
-        # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-        #
         location ~ \.php$ {
         location ~ \.php$ {
             try_files $uri =404;
             try_files $uri =404;
             fastcgi_pass   fastcgi_backend;
             fastcgi_pass   fastcgi_backend;
             fastcgi_keep_conn on;
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_index  index.php;
-#            fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
             include        /home/knewman/FrameworkBenchmarks/installs/nginx/conf/fastcgi_params;
             include        /home/knewman/FrameworkBenchmarks/installs/nginx/conf/fastcgi_params;
         }
         }
 
 
-        # deny access to .htaccess files, if Apache's document root
-        # concurs with nginx's one
-        #
-        #location ~ /\.ht {
-        #    deny  all;
-        #}
     }
     }
-
-
-    # another virtual host using mix of IP-, name-, and port-based configuration
-    #
-    #server {
-    #    listen       8000;
-    #    listen       somename:8080;
-    #    server_name  somename  alias  another.alias;
-
-    #    location / {
-    #        root   html;
-    #        index  index.html index.htm;
-    #    }
-    #}
-
-
-    # HTTPS server
-    #
-    #server {
-    #    listen       443;
-    #    server_name  localhost;
-
-    #    ssl                  on;
-    #    ssl_certificate      cert.pem;
-    #    ssl_certificate_key  cert.key;
-
-    #    ssl_session_timeout  5m;
-
-    #    ssl_protocols  SSLv2 SSLv3 TLSv1;
-    #    ssl_ciphers  HIGH:!aNULL:!MD5;
-    #    ssl_prefer_server_ciphers   on;
-
-    #    location / {
-    #        root   html;
-    #        index  index.html index.htm;
-    #    }
-    #}
-
 }
 }

+ 1 - 1
frameworks/PHP/limonade/deploy/php-fpm.pid

@@ -1 +1 @@
-4865
+8414

+ 1 - 1
frameworks/PHP/limonade/index.php

@@ -6,7 +6,7 @@ function configure() {
 	$cfg = ActiveRecord\Config::instance();
 	$cfg = ActiveRecord\Config::instance();
 	$cfg->set_model_directory("models");
 	$cfg->set_model_directory("models");
 	$cfg->set_connections(array(
 	$cfg->set_connections(array(
-		"development" => "mysql://benchmarkdbuser:benchmarkdbpass@127.0.0.1/hello_world?charset=utf8"));
+		"development" => "mysql://benchmarkdbuser:benchmarkdbpass@localhost/hello_world?charset=utf8"));
 
 
 option("bas_url", "/");
 option("bas_url", "/");
 }
 }