Merge branch 'master' into nginx-deb

nginx.conf

@@ -1,5 +1,5 @@
 events {
-  worker_connections 12;
+  worker_connections 64;
 }
 
 http{
@@ -24,7 +24,7 @@ http{
 	server {
 	    listen 80;
 
-	    error_log syslog:server=unix:/dev/log;
+	    error_log /dev/stderr;
 	    access_log syslog:server=unix:/dev/log;
 
 
@@ -76,7 +76,7 @@ http{
 	   }
 
 	   location /media {
-	    	try_files /var/www /opt/seafile/seafile-server-latest/seahub;
+	    	root /opt/seafile/seafile-server-latest/seahub;
 	   }
 	}
 

scripts/seafile-server.sh

@@ -115,6 +115,12 @@ case "$1" in
  ;;
  maintanance)
   $0 stop
+  if [ "$2" = "--fsck" ]; then 
+   $LATEST/seaf-fsck.sh
+  fi
+  if [ "$2" = "--fsck-repair" ]; then 
+   $LATEST/seaf-fsck.sh --repair
+  fi
   $LATEST/seaf-gc.sh
   $0 start
  ;; 

scripts/upgrade.py

@@ -58,8 +58,7 @@ def perform_upgrade_command(version,mysql=False,yes=True):
    print len(current) == 1 and current[0] == 0
    if len(current) == 1 and current[0] == 0: #Not installed
       print("Running installer.")
-      installer = os.path.join(seaf_home,"seafile-server-%s" % version,"setup-seafile%s.sh" % ("-mysql" if mysql else ""))
-      if not call(["seafile-server","setup"],stdout=sys.stdout, stdin=sys.stdin):
+      if not call(["seafile-server","setup", os.path.join(seaf_home,"seafile-server-%s" % version) ],stdout=sys.stdout, stdin=sys.stdin):
         sys.exit(1)
       sys.exit(126)
    script_re = "^upgrade_(\d+).(\d+)_(\d+).(\d+)\.sh$"