[WIP][CI SKIP] nginx real_ip

.drone.yml

@@ -1,6 +1,16 @@
 pipeline:
+ nginx-conf:
+    image: nginx:mainline
+    commands: 
+     - cp -r nginx /etc/nginx
+     - nginx -t
  docker:
-  image: plugins/docker
-  repo: repo.shimun.net/shimun/seafile
-  registry: repo.shimun.net
-  secrets: ["docker_username", "docker_password"]
+    image: plugins/docker
+    repo: repo.shimun.net/shimun/seafile
+    registry: repo.shimun.net
+    storage_path: /drone/.docker
+    secrets: ["docker_username", "docker_password"]
+    storage_path: /drone/.docker
+    cache_from: ["repo.shimun.net/shimun/seafile", "repo.shimun.net/shimun/seafile:nginx-deb", "repo.shimun.net/shimun/seafile:alpine"]
+    use_cache: true
+    pull_image: false

Dockerfile

@@ -14,12 +14,13 @@ RUN apt update && apt install locales -y && apt install -y --no-install-recommen
 
 COPY conf /opt/seafile/conf
 COPY conf /etc/seafile
-COPY nginx.conf /etc/nginx/nginx.conf
+COPY nginx /etc/nginx
 COPY scripts/upgrade.py /usr/local/sbin/upgrade
+COPY scripts/start-nginx.sh /usr/bin/start-nginx
 COPY scripts/seafile-server.sh /sbin/seafile-server
 
 RUN ulimit -n 30000 && mkdir -p $SEAF/pids && \
-    chmod +x /usr/local/sbin/upgrade /sbin/seafile-server
+    chmod +x /usr/local/sbin/upgrade /sbin/seafile-server /usr/bin/start-nginx
 
 ENV SEAF_UPGRADE_INTERVAL=3
 

nginx.conf

@@ -1,83 +0,0 @@
-events {
-  worker_connections 12;
-}
-
-http{
-
-	    upstream hub {
-		server 127.0.0.1:8000;
-		keepalive 2;
-	    }
-
-	    upstream files {
-		server 127.0.0.1:8082;
-		keepalive 4;
-	    }
-
-	    upstream webdav {
-		server 127.0.0.1:8080;
-		keepalive 2;
-	    }
-
-        disable_symlinks off;
-
-	server {
-	    listen 80;
-
-	    error_log syslog:server=unix:/dev/log;
-	    access_log syslog:server=unix:/dev/log;
-
-
-
-
-	    proxy_set_header X-Forwarded-For $remote_addr;
-
-	    location / {
-		 proxy_pass         http://hub;
-		 proxy_set_header   Host $host;
-		 proxy_set_header   X-Real-IP $remote_addr;
-		 proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-		 proxy_set_header   X-Forwarded-Host $server_name;
-		 proxy_read_timeout  1200s;
-
-		 # used for view/edit office file via Office Online Server
-		 client_max_body_size 0;
-
-	    }
-
-	    location /seafhttp {
-		rewrite ^/seafhttp(.*)$ $1 break;
-		proxy_pass http://files;
-		proxy_http_version 1.1;
-		client_max_body_size 0;
-		proxy_connect_timeout  3s;
-		proxy_read_timeout  3600s;
-		proxy_send_timeout  3600s;
-		send_timeout  3600s;
-	    }
-
-	    location /seafdav {
-		fastcgi_pass    webdav;
-		fastcgi_keep_conn on;
-		fastcgi_param   SCRIPT_FILENAME     $document_root$fastcgi_script_name;
-		fastcgi_param   PATH_INFO           $fastcgi_script_name;
-
-		fastcgi_param   SERVER_PROTOCOL     $server_protocol;
-		fastcgi_param   QUERY_STRING        $query_string;
-		fastcgi_param   REQUEST_METHOD      $request_method;
-		fastcgi_param   CONTENT_TYPE        $content_type;
-		fastcgi_param   CONTENT_LENGTH      $content_length;
-		fastcgi_param   SERVER_ADDR         $server_addr;
-		fastcgi_param   SERVER_PORT         $server_port;
-		fastcgi_param   SERVER_NAME         $server_name;
-
-		client_max_body_size 0;
-
-	   }
-
-	   # location /media {
-	   # 	root /opt/seafile/seafile-server-latest/seahub;
-	   # }
-	}
-
-}

nginx/backends.conf

@@ -0,0 +1,14 @@
+upstream hub {
+	server 127.0.0.1:8000;
+	keepalive 2;
+}
+
+upstream files {
+	server 127.0.0.1:8082;
+	keepalive 4;
+}
+
+upstream webdav {
+	server 127.0.0.1:8080;
+	keepalive 2;
+}

nginx/nginx.conf

@@ -0,0 +1,24 @@
+events {
+	worker_connections 64;
+}
+
+http {
+
+	include backends.conf;
+
+	disable_symlinks off;
+
+	server {
+
+		listen 80;
+
+		error_log /dev/stderr;	
+		
+		include seafile/*.conf;
+
+		include realip.conf;		
+
+		include extra.conf;
+	}
+
+}

nginx/realip.conf

@@ -0,0 +1,2 @@
+real_ip_header X-Forwarded-For;
+set_real_ip_from 127.0.0.1;

nginx/seafile/media.conf

@@ -0,0 +1,3 @@
+location /media {
+	root /opt/seafile/seafile-server-latest/seahub;
+}

nginx/seafile/seafdav.conf

@@ -0,0 +1,18 @@
+location /seafdav {
+	fastcgi_pass    webdav;
+	fastcgi_keep_conn on;
+	fastcgi_param   SCRIPT_FILENAME     $document_root$fastcgi_script_name;
+	fastcgi_param   PATH_INFO           $fastcgi_script_name;
+
+	fastcgi_param   SERVER_PROTOCOL     $server_protocol;
+	fastcgi_param   QUERY_STRING        $query_string;
+	fastcgi_param   REQUEST_METHOD      $request_method;
+	fastcgi_param   CONTENT_TYPE        $content_type;
+	fastcgi_param   CONTENT_LENGTH      $content_length;
+	fastcgi_param   SERVER_ADDR         $server_addr;
+	fastcgi_param   SERVER_PORT         $server_port;
+	fastcgi_param   SERVER_NAME         $server_name;
+
+	client_max_body_size 0;
+
+}

nginx/seafile/seafhttp.conf

@@ -0,0 +1,10 @@
+location /seafhttp {
+	rewrite ^/seafhttp(.*)$ $1 break;
+	proxy_pass http://files;
+	proxy_http_version 1.1;
+	client_max_body_size 0;
+	proxy_connect_timeout  3s;
+	proxy_read_timeout  3600s;
+	proxy_send_timeout  3600s;
+	send_timeout  3600s;
+}

nginx/seafile/seahub.conf

@@ -0,0 +1,14 @@
+location / {
+	proxy_pass         http://hub;
+	proxy_set_header   Host $host;
+	proxy_set_header   X-Real-IP $remote_addr;
+	proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_set_header   X-Forwarded-Host $server_name;
+	proxy_read_timeout  1200s;
+
+	# used for view/edit office file via Office Online Server
+	client_max_body_size 0;
+	
+	access_log /dev/stdout;
+
+}

scripts/seafile-server.sh

@@ -3,7 +3,7 @@
 LATEST=$SEAF/seafile-server-latest
 PIDS=$SEAF/pids
 PIDFILES=("$PIDS" "$LATEST/runtime" "/var/run/nginx")
-COMMANDS=("seaf-server $LATEST/seafile.sh start" "seahub $LATEST/seahub.sh ${SEAF_HUB_MODE:-start} 8000" "nginx /usr/sbin/nginx")
+COMMANDS=("seaf-server $LATEST/seafile.sh start" "seahub $LATEST/seahub.sh ${SEAF_HUB_MODE:-start} 8000" "nginx /usr/bin/start-nginx")
 
 function stop {
  #Kill when hitting CTRL+C repeatedly
@@ -51,7 +51,7 @@ case "$1" in
    mkdir -p $SEAF/conf
    cp /etc/seafile/* $SEAF/conf/* -rf
    $0 run-upgrade
-   exit
+   exit $?
   else
    patch_seahub_conf
    for CMD in "${COMMANDS[@]}"; do
@@ -81,6 +81,10 @@ case "$1" in
  run-upgrade)
   $0 upgrade
   RES=$?
+  if [ $RES -eq 1 ]; then
+   echo "Failed upgrade"
+   exit 1
+  fi
   if [ $RES -eq 127 ]; then
    #No upgrade
    true
@@ -109,6 +113,28 @@ case "$1" in
   /usr/local/sbin/upgrade main
   kill -SIGHUP $(pgrep -o nginx) #Reload nginx
  ;;
+ 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
+ ;; 
+ setup)
+  INSTALLDIR=$2
+  SETUP_ARGS="auto -n ${SEAF_NAME:-$(hostname)} -i $(hostname) -p 8082"
+  if [ ! -z "$SEAF_MYSQL" ]; then
+   $INSTALLDIR/setup-seafile-mysql.sh $SETUP_ARGS -o $SEAF_MYSQL_HOST -t ${SEAF_MYSQL_PORT:-3306} -u "${SEAF_MYSQL_USER:-root}" \
+     -w "$SEAF_MYSQL_PASS" -r "${SEAF_MYSQL_ROOT_PASS:-$SEAF_MYSQL_PASS}" -c ${SEAF_MYSQL_DB_CCNET:-ccnet} -s ${SEAF_MYSQL_DB_SEAF:-seafile} \
+     -b ${SEAF_MYSQL_DB_HUB:-seahub}
+  else
+   $INSTALLDIR/setup-seafile.sh $SETUP_ARGS
+  fi
+ ;;  
  status)
    RUNNING=1
    for CMD in seafile-controller ccnet "${COMMANDS[@]}"; do

scripts/start-ngix.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo "$SEAF_FRONTEND" | IFS=';' while read IP; do 
+ echo "set_real_ip_from $IP;" >> /etc/nginx/realip.conf
+done
+#This script is only supposed to run once
+rm -f $0 && ln -s /usr/sbin/nginx $0 && /usr/sbin/nginx

scripts/upgrade.py

@@ -37,6 +37,14 @@ def list_command(page="https://www.seafile.com/en/download/"):
 def current_version_command():
     print(current_version())
 
+def installed_versions():
+    installed = []
+    for f in os.listdir(seaf_home):
+       m = re.findall(version_re,f)
+       if len(m) > 0:
+          installed.append(m[0])
+    return installed
+
 def current_version():
     current = os.path.realpath(os.path.join(seaf_home, "seafile-server-latest"))
     res = re.findall(version_re,current)
@@ -49,10 +57,10 @@ def perform_upgrade_command(version,mysql=False,yes=True):
    target = map(lambda x: int(x), version.split("."))
    print len(current) == 1 and current[0] == 0
    if len(current) == 1 and current[0] == 0: #Not installed
-      print("Running installer, please don't change any default values regarding ports.")
-      installer = os.path.join(seaf_home,"seafile-server-%s" % version,"setup-seafile%s.sh" % ("-mysql" if mysql else ""))
-      call(["sh","-c",installer],stdout=sys.stdout, stdin=sys.stdin)
-      return 0
+      print("Running installer.")
+      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$"
    run = []
    last = None
@@ -70,20 +78,42 @@ def perform_upgrade_command(version,mysql=False,yes=True):
       cmd.append(script)
       call(["/bin/sh", "-c", ''.join(cmd)], stdout=sys.stdout, stdin=(None if yes else sys.stdin))
 
-def install_command(url):
+def download(url, version):
    tmp = tempfile.mkdtemp()
-   if call(["/bin/sh", "-c", 'cd %s; curl %s | tar xzv' % (tmp, url)]) == 0:
+   filename = "server_%s.tar.gz" % version
+   pks = os.path.join(seaf_home, "pkg")
+   if not os.path.exists(pks):
+      os.mkdir(pks)
+   dest = os.path.join(pks, filename)
+   if os.path.exists(dest):
+      return dest
+   if call(["/bin/sh", "-c", 'curl %s --output %s/%s' % (url, tmp, filename)]) == 0:     
+      shutil.move(os.path.join(tmp,filename), dest)
+      call(["/bin/chmod", "-w", dest])
+      return dest
+   else:
+      print("Download failed")
+      return 0
+
+def install_command(url, version):
+   pkg = download(url, version)
+   tmp = tempfile.mkdtemp()
+   if pkg and call(["/bin/sh", "-c", 'cd %s; tar xzvf %s' % (tmp, pkg)]) == 0:
       for f in os.listdir(tmp):
+         dest = os.path.join(seaf_home, os.path.basename(f))
          if len(re.findall(version_re, f)) > 0:
-             dest = os.path.join(seaf_home, os.path.basename(f))
-             shutil.move(os.path.join(tmp,f), dest)
+             if not os.path.exists(dest):           
+                shutil.move(os.path.join(tmp,f), dest)
+             else:
+                shutil.rmtree(tmp)
+                print("Found previous installation, resuming setup")
              current = current_version()
              target_version = ''.join(re.findall(version_re,dest))
              if len(current) == 1: current = current[0] 
              else: current = "0.0.0"
              print("Upgrading from: %s -> %s" % (current, target_version))
-             perform_upgrade_command(target_version,mysql=(os.environ["SEAF_MYSQL"] or False))
-      if len(os.listdir(tmp)) != 0:
+             perform_upgrade_command(target_version,mysql=("SEAF_MYSQL" in os.environ and os.environ["SEAF_MYSQL"]))
+      if os.path.exists(tmp) and len(os.listdir(tmp)) != 0:
          print("Failed to unpack update")
          os.rmdir(tmp)
          return 1
@@ -95,19 +125,21 @@ def main_command(version="latest",page="https://www.seafile.com/en/download/"):
    avail = available(page)
    install = None
    if version == "latest":
-      (install,version) = avail.items()
+      (version,install) = avail.items()[0]
    else:
       if version in dict(avail.items()):
          install = dict(avail.items())[version]
    if version_int(current_version()) == version_int(version):
       print("%s(%s) is already installed" % (version,version_int(version)))
-      return 1
+      sys.exit(126)
+   if version in installed_versions():
+      return perform_upgrade_command(version)
    if install:
-      print("Installing: %s" % install[1])
-      return install_command(install[1])
+      print("Installing: %s" % version)
+      sys.exit(install_command(install, version))
    else:
       print("Couldn't determine download for %s" % version)
-      return 1
+      sys.exit(1)
 
 if __name__ == '__main__':
    import scriptine

seafile.service

@@ -0,0 +1,31 @@
+[Unit]
+Description=Seafile container https://git.shimun.net/shimun/docker-seafile
+
+[Service]
+Slice=machine.slice
+# Resource limits
+Delegate=true
+CPUShares=256
+MemoryLimit=512M
+
+Environment=ROOT_DIR=/srv/seafile
+Environment=SEAF_MYSQL=""			#Empty = Sqlite
+Environment=SEAF_URL="https://seaf.example.com"
+Environment=SEAF_UPGRADE_INTERVAL=10
+
+#Run first once to setup
+#rkt --insecure-options=image run --dns 8.8.8.8 --volume volume-opt-seafile,kind=host,source=${ROOT_DIR} docker://repo.shimun.net/shimun/seafile --environment=SEAF_URL="https://seaf.example.com" --interactive
+
+ExecStartPre=/bin/mkdir -p ${ROOT_DIR}
+ExecStart=/usr/bin/rkt --insecure-options=image run --uuid-file-save=${ROOT_DIR}/container.uuid --dns 8.8.8.8 --inherit-env --volume volume-opt-seafile,kind=host,source=${ROOT_DIR} --port 80-tcp:8080 \
+                       docker://repo.shimun.net/shimun/seafile --environment=SEAF_UPGRADE_INTERVAL=${SEAF_UPGRADE_INTERVAL}                       
+ExecStartPost=/bin/bash -c "echo 'rkt enter --app=seafile $(cat '${ROOT_DIR}'/container.uuid)' > ${ROOT_DIR}/enter.sh && chmod +x ${ROOT_DIR}/enter.sh"
+ExecStopPre=/bin/bash -c "rkt enter --app=seafile $(cat ${ROOT_DIR}/container.uuid) 'seafile-server stop'"        
+ExecStopPost=/bin/bash -c "rkt rm $(cat ${ROOT_DIR}/container.uuid)"
+ExecStopPost=/bin/rm ${ROOT_DIR}/container.uuid
+KillMode=mixed
+Restart=always
+RestartSec=30
+
+[Install]
+WantedBy=multi-user.target