From ddcb98614a60b6993a1e9271826662aaaa54838d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 21 Mar 2013 12:31:11 -0400 Subject: [PATCH] Fix php/nginx conf files --- conf/nginx/mime.types | 79 +++++++++++++++++++++++++++++++++++++++++++ conf/nginx/nginx.conf | 27 +++------------ conf/nginx/php.conf | 20 ++++++++++- conf/php/php-fpm.conf | 12 +++---- 4 files changed, 108 insertions(+), 30 deletions(-) create mode 100644 conf/nginx/mime.types diff --git a/conf/nginx/mime.types b/conf/nginx/mime.types new file mode 100644 index 00000000..5d132eb2 --- /dev/null +++ b/conf/nginx/mime.types @@ -0,0 +1,79 @@ +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/x-javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + image/svg+xml svg svgz; + image/webp webp; + + application/java-archive jar war ear; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.ms-excel xls; + application/vnd.ms-powerpoint ppt; + application/vnd.wap.wmlc wmlc; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream eot; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/conf/nginx/nginx.conf b/conf/nginx/nginx.conf index 56472b5d..bca4bd5d 100644 --- a/conf/nginx/nginx.conf +++ b/conf/nginx/nginx.conf @@ -2,7 +2,7 @@ user hlissner staff; worker_processes 1; pid /usr/local/var/run/nginx.pid; -error_log /usr/local/var/log/nginx-error.log +error_log /usr/local/var/log/nginx-error.log; events { worker_connections 1024; @@ -10,7 +10,7 @@ events { http { - include mime.types; + include mime.types; default_type application/octet-stream; #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' @@ -33,7 +33,7 @@ http { proxy_redirect off; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forward_for; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_max_temp_file_size 0; proxy_connect_timeout 90; @@ -48,7 +48,7 @@ http { server { listen 80; server_name localhost dev; - root /usr/local/dev/www/public; + root /usr/local/www/public; index index.html index.php; @@ -66,23 +66,6 @@ http { } } - server { - listen 80; - server_name ~^demo\.(?.+)$; - index index.php index.html; - - root /usr/local/dev/www-live/$domain/public; - try_files $uri $uri/ /$uri.html /index.php; - - location ~ \.php { - include php.conf; - } - } - - server { - listen 80 default; - server_name dev.lissner.net n4s.co; - root /usr/local/dev/share; - } + include ~/.nginx/*.conf; } diff --git a/conf/nginx/php.conf b/conf/nginx/php.conf index 0b20fa95..9ab5ef76 100644 --- a/conf/nginx/php.conf +++ b/conf/nginx/php.conf @@ -1,4 +1,22 @@ -include fastcgi_params; +fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; +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_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 HTTPS $https if_not_empty; +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; +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_pass unix:/usr/local/var/run/php-fpm.sock; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/conf/php/php-fpm.conf b/conf/php/php-fpm.conf index 8c951dde..90d3cf00 100644 --- a/conf/php/php-fpm.conf +++ b/conf/php/php-fpm.conf @@ -10,8 +10,8 @@ ;;;;;;;;;;;;;;;;;; [global] -daemonize = no -pid = run/php54-fpm.pid +daemonize = yes +pid = run/php-fpm.pid error_log = log/php-fpm.log ;syslog.facility = daemon ;syslog.ident = php-fpm @@ -30,10 +30,10 @@ error_log = log/php-fpm.log [www] ;prefix = /path/to/pools/$pool -user = hlissner -group = staff +;user = hlissner +;group = staff -listen = /usr/local/var/run/php54-fpm.sock +listen = /usr/local/var/run/php-fpm.sock ;listen.backlog = 128 ;listen.owner = _www ;listen.group = _www @@ -69,8 +69,6 @@ pm.max_spare_servers = 5 ;env[TMPDIR] = /tmp ;env[TEMP] = /tmp - -[php_ini] ;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com ;php_flag[display_errors] = off ;php_admin_value[error_log] = /var/log/fpm-php.www.log