Skip to content

Commit

Permalink
Updates to the configuration files.
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Gibson committed Apr 30, 2011
1 parent af3e934 commit bf48894
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 8 deletions.
8 changes: 4 additions & 4 deletions nginx.conf
Expand Up @@ -32,10 +32,10 @@ http {


gzip on; gzip on;


if (-e /usr/local/sites/passenger.conf) #if (-e /usr/local/sites/passenger.conf)
{ #{
include /usr/local/sites/passenger.conf; # include /usr/local/sites/passenger.conf;
} #}
#passenger_default_user patrick; #passenger_default_user patrick;
#passenger_friendly_error_pages off; #passenger_friendly_error_pages off;


Expand Down
4 changes: 4 additions & 0 deletions passenger.conf-example
@@ -0,0 +1,4 @@
# point these to your own environment's passenger and ruby
passenger_root /Library/Ruby/Gems/1.8/gems/passenger-3.0.7;
passenger_ruby /Users/patrick/.rvm/bin/ree-1.8.7-2011.03;

4 changes: 4 additions & 0 deletions upstreams/aapp.conf
@@ -0,0 +1,4 @@
upstream aapp
{
server localhost:3000 max_fails=3 fail_timeout=2s;
}
4 changes: 4 additions & 0 deletions upstreams/wingate-proxy.conf
@@ -0,0 +1,4 @@
upstream wingate-proxy
{
server localhost:4567 max_fails=3 fail_timeout=2s;
}
38 changes: 38 additions & 0 deletions virtualhosts/localhost.agencies.adobe.com.conf
@@ -0,0 +1,38 @@
server
{
listen 127.0.0.1:8080;
server_name localhost.agencies.adobe.com;

root /usr/local/sites/adobe-agency-partner-portal/public;
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_set_header X_FORWARDED_PROTO https;
proxy_set_header Host $http_host; proxy_pass_header ATTENDEASE_PROXY_ACCESS_TOKEN;
proxy_pass_header jr_token;
proxy_pass_header HTTP_X_JR_TOKEN; proxy_pass_header X_JR_TOKEN;
proxy_pass_header Jr_token;
proxy_pass_header Set-Cookie;
proxy_pass http://aapp;

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;
}
}
}
21 changes: 21 additions & 0 deletions virtualhosts/localhost.max.adobe.com.conf
Expand Up @@ -39,4 +39,25 @@ server
gzip_types text/plain text/css application/xml application/json application/javascript; gzip_types text/plain text/css application/xml application/json application/javascript;
gzip_disable "MSIE [1-6]\."; gzip_disable "MSIE [1-6]\.";
} }

location ^~ /ae/
{
rewrite ^/ae/(.*) /$1 break;
proxy_pass_request_headers on;
proxy_ignore_headers Expires Cache-Control;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X_FORWARDED_PROTO https;
proxy_set_header Host $http_host; proxy_pass_header ATTENDEASE_PROXY_ACCESS_TOKEN;
proxy_pass_header jr_token;
proxy_pass_header HTTP_X_JR_TOKEN; proxy_pass_header X_JR_TOKEN;
proxy_pass_header Jr_token;
proxy_pass_header Set-Cookie;
proxy_pass http://wingate-proxy;

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]\.";
}
} }
8 changes: 4 additions & 4 deletions virtualhosts/localhost.youthvoices.adobe.com.conf
Expand Up @@ -11,11 +11,11 @@ server
rewrite ^(.*)-([0-9]+)\.(css|js|png|swf|xml)$ $1.$3 break; rewrite ^(.*)-([0-9]+)\.(css|js|png|swf|xml)$ $1.$3 break;
} }


rewrite ^/about/impact/$ /about/?tab=impact rewrite ^/about/impact/$ /about/?tab=impact;
rewrite ^/partners/sites/$ /partners/?tab=sites rewrite ^/partners/sites/$ /partners/?tab=sites;
rewrite ^/gallery/.* http://tv.adobe.com/show/adobe-youth-voices/ rewrite ^/gallery/.* http://tv.adobe.com/show/adobe-youth-voices/;


error_page 404 /error/notfound.php error_page 404 /error/notfound.php;


location ~ \.php$ location ~ \.php$
{ {
Expand Down

0 comments on commit bf48894

Please sign in to comment.