Hopefully final conf changes

config/diaspora.conf

@@ -1,36 +0,0 @@
-upstream thin_cluster {
- server unix:/tmp/thin.0.sock;
-}
-
-server {
-
- listen       80;
- server_name  babycakes.sofaer.net www.babycakes.sofaer.net;
- root /usr/local/app/diaspora/current;
-
- location / {
-   proxy_set_header X-Real-IP $remote_addr;
-   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-   proxy_set_header Host $http_host;
-   proxy_redirect off;
-   proxy_buffering off;
-
-   if (-f $request_filename/index.html) {
-     rewrite (.*) $1/index.html break;
-   }
-   if (-f $request_filename.html) {
-     rewrite (.*) $1.html break;
-   }
-   if (!-f $request_filename) {
-     proxy_pass http://thin_cluster;
-     break;
-   }
- }
-
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
-   root html;
- }
-
-}
-

config/sprinkle/conf/nginx.conf

@@ -26,7 +26,41 @@ http {
  gzip_buffers      16 8k;
  #gzip_types        text/plain text/html text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript;
  # gzip_disable      "MSIE [1-6]\.(?!.*SV1)";
-
- include /usr/local/sbin/conf/servers/*.conf;
+upstream thin_cluster {
+ server unix:/tmp/thin.0.sock;
+}
+
+server {
+
+ listen       80;
+ server_name  babycakes.sofaer.net www.babycakes.sofaer.net;
+ root /usr/local/app/diaspora/current;
+
+ location / {
+   proxy_set_header X-Real-IP $remote_addr;
+   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+   proxy_set_header Host $http_host;
+   proxy_redirect off;
+   proxy_buffering off;
+
+   if (-f $request_filename/index.html) {
+     rewrite (.*) $1/index.html break;
+   }
+   if (-f $request_filename.html) {
+     rewrite (.*) $1.html break;
+   }
+   if (!-f $request_filename) {
+     proxy_pass http://thin_cluster;
+     break;
+   }
+ }
+
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+   root html;
+ }
+
+}
+
 }
 

config/sprinkle/provision.rb

@@ -35,13 +35,13 @@ require "#{File.dirname(__FILE__)}/packages/ruby"
 
 policy :diaspora, :roles => :app do
 #  requires :clean_dreamhost
-  requires :tools
-  requires :rubygems
-	requires :bundler
-  requires :diaspora_dependencies
-  requires :database
+#  requires :tools
+#  requires :rubygems
+#	requires :bundler
+#  requires :diaspora_dependencies
+#  requires :database
   requires :webserver
-  requires :scm
+#  requires :scm
 end