shimun/docker-seafile
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: shimun:pull_prev
Branches Tags
shimun:master shimun:riffol shimun:py3 shimun:arch shimun:real_ip shimun:no_media shimun:drone shimun:alpine shimun:nginx-deb shimun:pull_prev
shimun:py3 shimun:v0.1
..
compare: shimun:nginx-deb
Branches Tags
shimun:master shimun:riffol shimun:py3 shimun:arch shimun:real_ip shimun:no_media shimun:drone shimun:alpine shimun:nginx-deb shimun:pull_prev
shimun:py3 shimun:v0.1

5 Commits
pull_prev ... nginx-deb

Author SHA1 Message Date
shim_
6fb12158b0 Merge branch 'master' into nginx-deb 2018-11-10 15:36:29 +01:00
shim_
69824d3497 Merge branch 'pull_prev' into nginx-deb 2018-11-10 15:33:39 +01:00
shim_
38da3057a3 more worker connections 2018-11-04 17:39:34 +01:00
shim_
8dc75bc553 improved commands 2018-11-03 21:11:55 +01:00
shim_
27ec24d567 Merged working scripts into master(alpine) 2018-09-09 22:51:47 +02:00
3 changed files with 10 additions and 5 deletions
Expand all files Collapse all files

6
nginx.conf
View File

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

6
scripts/seafile-server.sh
View File

@ -115,6 +115,12 @@ case "$1" in
;; ;;
maintanance) maintanance)
$0 stop $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 $LATEST/seaf-gc.sh
$0 start $0 start
;; ;;

3
scripts/upgrade.py
View File

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