Fixed --pid option in deploy docs.

davisp · davisp · commit 560a4895d8de · 2011-04-19T11:15:01.000-04:00
Thanks to Miguel Araujo for spotting it. Fixes benoitc#198
diff --git a/doc/htdocs/deploy.html b/doc/htdocs/deploy.html
@@ -70,14 +70,16 @@ <h2><a class="toc-backref" href="#contents">Nginx Configuration</a></h2>
         root /path/to/app/current/public;
 
         location / {
+            # checks for static file, if not found proxy to app
+            try_files $uri &#64;proxy_to_app;
+        }
+
+        location &#64;proxy_to_app {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header Host $http_host;
             proxy_redirect off;
 
-            if (!-f $request_filename) {
-                proxy_pass http://app_server;
-                break;
-            }
+            proxy_pass   http://app_server;
         }
 
         error_page 500 502 503 504 /500.html;
@@ -152,7 +154,7 @@ <h3><a class="toc-backref" href="#contents">Runit</a></h3>
 if [ -f $PID ]; then rm $PID fi
 
 cd $ROOT
-exec $GUNICORN -c $ROOT/gunicorn.conf.py --pidfile=$PID $APP
+exec $GUNICORN -c $ROOT/gunicorn.conf.py --pid=$PID $APP
 </pre>
 </div>
 <div class="section" id="supervisor">
diff --git a/doc/site/deploy.rst b/doc/site/deploy.rst
@@ -141,7 +141,7 @@ An `example service`_ definition::
     if [ -f $PID ]; then rm $PID fi
  
     cd $ROOT
-    exec $GUNICORN -c $ROOT/gunicorn.conf.py --pidfile=$PID $APP
+    exec $GUNICORN -c $ROOT/gunicorn.conf.py --pid=$PID $APP
 
 Supervisor
 ++++++++++
