nginx.conf: repair broken log format (someone had swapped two variables around, breaking the intended apache log format compatibility)

Conflicts:
	nginx/nginx.conf

nginx/nginx.conf

@@ -38,10 +38,10 @@ http {
   include       /etc/nginx/mime.types;
   default_type  application/octet-stream;
 
-  # Format for our log files
-  log_format  main '$remote_addr - $remote_user [$time_local]  $status '
-    '"$request" $body_bytes_sent "$http_referer" '
-    '"$http_user_agent" "$http_x_forwarded_for"';
+  # Format to use in log files
+  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
 
   # Default log file
   # (this is only used when you don't override access_log on a server{} level)