Browse Source

moved index file to root directory

Keith Newman 10 years ago
parent
commit
84160d5e48

+ 2 - 5
frameworks/PHP/lumen/deploy/nginx.conf

@@ -7,8 +7,7 @@ events {
 }
 }
 
 
 http {
 http {
-    #include       /home/knewman/FrameworkBenchmarks/installs/nginx/conf/mime.types;
-    include /usr/local/nginx/conf/mime.types;
+    include /usr/local/nginx/conf/mime.types;    
     default_type  application/octet-stream;
     default_type  application/octet-stream;
     access_log off;
     access_log off;
     sendfile        on;
     sendfile        on;
@@ -22,8 +21,7 @@ http {
         listen       8080;
         listen       8080;
         server_name  localhost;
         server_name  localhost;
 
 
-        #root /home/knewman/FrameworkBenchmarks/frameworks/PHP/lumen/public/;
-        root /home/ubuntu/FrameworkBenchmarks/lumen/public/;
+        root /home/ubuntu/FrameworkBenchmarks/lumen/;
         index  index.php;
         index  index.php;
 
 
         location / {
         location / {
@@ -36,7 +34,6 @@ http {
             fastcgi_keep_conn on;
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_index  index.php;
             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        /usr/local/nginx/conf/fastcgi_params;
             include        /usr/local/nginx/conf/fastcgi_params;
         }
         }
 
 

+ 6 - 0
frameworks/PHP/lumen/index.php

@@ -0,0 +1,6 @@
+<?php
+
+$app = require __DIR__.'/bootstrap/app.php';
+
+$app->run();
+

+ 0 - 3
frameworks/PHP/lumen/public/index.php

@@ -2,8 +2,5 @@
 
 
 $app = require __DIR__.'/../bootstrap/app.php';
 $app = require __DIR__.'/../bootstrap/app.php';
 
 
-echo "~~~~~~~~~~~~~~~ APP VAR DUMP ~~~~~~~~~~~~~";
-var_dump($app);
-
 $app->run();
 $app->run();
 
 

+ 2 - 2
frameworks/PHP/lumen/setup.sh

@@ -5,8 +5,8 @@ export COMPOSER_HOME=${IROOT}/php-composer
 export PHP_FPM=${PHP_HOME}/sbin/php-fpm
 export PHP_FPM=${PHP_HOME}/sbin/php-fpm
 export NGINX_HOME=${IROOT}/nginx
 export NGINX_HOME=${IROOT}/nginx
 
 
-sed -i 's|localhost|'"${DBHOST}"'|g' public/index.php
-sed -i 's|root .*/FrameworkBenchmarks/lumen/public|root '"${TROOT}"'|g' deploy/nginx.conf
+sed -i 's|localhost|'"${DBHOST}"'|g' index.php
+sed -i 's|root .*/FrameworkBenchmarks/lumen|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
 
 $PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 $PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid