Permalink
Browse files

Merge branch 'master' of github.com:coverall/nginx

  • Loading branch information...
Julian Jorgensen
Julian Jorgensen committed Nov 14, 2011
2 parents b964555 + 245195a commit a5e344c936213e5bccca3b3c6e44d138afd4861f
View
@@ -68,21 +68,19 @@ Check that MongoDB is running:
http://localhost:28017/
-## Step 6: Install [MySQL](http://mysql.org/)
+## Step 6: Install [MySQL](http://mysql.org/) (if you're needing to use it)
brew install mysql
*Note the instructions for copying the .plist file if you want to have MySQL automatically start when you log in.*
## Step 7: Install [PHP](http://php.net/) (optionally, but recommended) and [spawn-fcgi](http://redmine.lighttpd.net/projects/spawn-fcgi)
- brew create http://ca2.php.net/distributions/php-5.2.17.tar.gz
+Install PHP 5.2 from our own, modified recipe
-When an editor is opened up with the "formula", replace it with the contents of [[https://raw.github.com/gist/1142557/9f5232aa169c121d605292c8062329a1f8132f55/php.rb]].
+ brew install https://raw.github.com/gist/1142557/9f5232aa169c121d605292c8062329a1f8132f55/php.rb --with-mysql
-Next, Install PHP
-
- brew install php --with-mysql
+*Note that --with-mysql should only be used above if you've installed MySQL in Step 6!*
Then install spawn-fcgi:
View
@@ -65,6 +65,7 @@ types {
audio/x-realaudio ra;
video/3gpp 3gpp 3gp;
+ video/mp4 mp4;
video/mpeg mpeg mpg;
video/quicktime mov;
video/x-flv flv;
View
@@ -47,6 +47,7 @@ http {
include upstreams/*.conf;
include virtualhosts/*.conf;
+ include third-party/*.conf;
#server {
#listen 8080;
View
@@ -106,7 +106,7 @@ http {
# ssl_session_timeout 5m;
# ssl_protocols SSLv2 SSLv3 TLSv1;
- # ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
+ # ssl_ciphers HIGH:!aNULL:!MD5;
# ssl_prefer_server_ciphers on;
# location / {
View
@@ -0,0 +1,2 @@
+Place your local .conf files for third-party modules that you may be using (such as Passenger).
+
@@ -0,0 +1,4 @@
+upstream youthvoices
+{
+ server localhost:3000 max_fails=3 fail_timeout=2s;
+}
@@ -3,32 +3,43 @@ server
listen 127.0.0.1:8080;
server_name localhost.attendease.com;
- root /usr/local/sites/attendease/public;
+ # Rails app
+ #root /usr/local/sites/attendease/public;
+ # PHP 'coming soon' page
+ root /usr/local/sites/attendease_landing;
index index.php index.html index.htm;
if (!-e $request_filename)
{
rewrite ^(.*)-([0-9]+)\.(css|js|png|swf|xml)$ $1.$3 break;
}
- location ^~ /
- {
- proxy_pass_request_headers on;
- proxy_ignore_headers Expires Cache-Control;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_pass_header Set-Cookie;
- proxy_set_header Host $http_host;
- proxy_pass http://attendease;
-
- gzip on;
- gzip_min_length 1000;
- gzip_proxied expired no-cache no-store private auth;
- gzip_types text/plain text/css application/xml application/json application/javascript;
- gzip_disable "MSIE [1-6]\.";
+# location ^~ /
+# {
+# proxy_pass_request_headers on;
+# proxy_ignore_headers Expires Cache-Control;
+# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# proxy_pass_header Set-Cookie;
+# proxy_set_header Host $http_host;
+# proxy_pass http://attendease;
+#
+# gzip on;
+# gzip_min_length 1000;
+# gzip_proxied expired no-cache no-store private auth;
+# gzip_types text/plain text/css application/xml application/json application/javascript;
+# gzip_disable "MSIE [1-6]\.";
+#
+# if (-f $request_filename)
+# {
+# break;
+# }
+# }
- if (-f $request_filename)
- {
- break;
- }
+ location ~ \.php$
+ {
+ fastcgi_pass 127.0.0.1:9000;
+ fastcgi_index index.php;
+ fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
+ include fastcgi_params;
}
}
@@ -0,0 +1,23 @@
+server
+{
+ listen 127.0.0.1:8080;
+ server_name localhost krunk.coverall.crew;
+
+ root /usr/local/sites;
+
+ index index.php index.html;
+
+ if (!-e $request_filename)
+ {
+ rewrite ^(.*)-([0-9]+)\.(css|js|png|swf)$ $1.$3 break;
+ rewrite ^.*$ /index.php last;
+ }
+
+ location ~ \.php$
+ {
+ fastcgi_pass 127.0.0.1:9000;
+ fastcgi_index index.php;
+ fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
+ include fastcgi_params;
+ }
+}
@@ -0,0 +1,24 @@
+server
+{
+ listen 127.0.0.1:8080;
+ server_name localhost.coverallcrew.com;
+
+ root /usr/local/sites/coverallcrew.com;
+
+ index index.php index.html;
+
+ if (!-e $request_filename)
+ {
+ rewrite ^(.*)-([0-9]+)\.(css|js|png|swf)$ $1.$3 break;
+ rewrite ^.*$ /index.php last;
+ }
+
+ location ~ \.php$
+ {
+ fastcgi_pass 127.0.0.1:9000;
+ fastcgi_index index.php;
+ fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
+ include fastcgi_params;
+ }
+}
+
@@ -0,0 +1,30 @@
+server
+{
+ listen 127.0.0.1:8080;
+ server_name localhost.crawfordgroup.com;
+
+ root /usr/local/sites/crawfordgroup.com;
+
+ index index.php index.html;
+
+ if (!-e $request_filename)
+ {
+ rewrite ^(.*)-([0-9]+)\.(css|js|png|swf)$ $1.$3 break;
+ }
+
+ location /
+ {
+ if (!-e $request_filename)
+ {
+ rewrite ^.*$ /index.php last;
+ }
+ }
+
+ location ~ \.php$
+ {
+ fastcgi_pass 127.0.0.1:9000;
+ fastcgi_index index.php;
+ fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
+ include fastcgi_params;
+ }
+}
@@ -0,0 +1,9 @@
+server
+{
+ listen 127.0.0.1:8080;
+ server_name localhost.fipa.bc.ca;
+
+ root /usr/local/sites/fipa.bc.ca;
+
+ index index.php index.html;
+}
Oops, something went wrong.

0 comments on commit a5e344c

Please sign in to comment.