Merge branch 'riffol'

.drone.yml

@@ -7,10 +7,11 @@ pipeline:
  docker:
     image: plugins/docker
     repo: repo.shimun.net/shimun/seafile
+    tag: riffol
     registry: repo.shimun.net
     storage_path: /drone/.docker
     secrets: ["docker_username", "docker_password"]
-    storage_path: /drone/.docker
+    storage_path: /drone/cache/.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

@@ -1,3 +1,7 @@
+FROM rust:1.36-slim AS riffol_build
+
+RUN cargo install --git https://github.com/shimunn/riffol.git --branch print_error
+
 FROM nginx:mainline
 
 VOLUME /opt/seafile
@@ -8,21 +12,39 @@ ENV SEAF=/opt/seafile
 
 COPY requirements.txt /tmp/requirements.txt
 
-RUN apt update && apt install locales -y && apt install -y --no-install-recommends procps openssl python2.7 python3 sqlite3 python-mysqldb python-pil curl libjansson4 libfuse2 python-pip python-pip-whl python-setuptools \
+RUN apt update && apt install locales -y && apt install -y --no-install-recommends procps openssl python2.7 sqlite3 python-mysqldb python-pil curl libjansson4 libfuse2 python-pip python-pip-whl python-setuptools python3 sqlite3 python3 python3-pip python3-setuptools python3-ldap \
-    && pip install -r /tmp/requirements.txt && apt remove -y python-pip \
     && rm -rf /var/lib/apt/lists/* /tmp/requirements.txt
     
+RUN python3 -m pip install --upgrade pip && rm -r /root/.cache/pip
+
+RUN pip3 install --timeout=3600 click termcolor colorlog pymysql \
+    django==1.11.29 && rm -r /root/.cache/pip
+
+ADD https://raw.githubusercontent.com/haiwen/seahub/master/requirements.txt /tmp/hub-requirements.txt
+
+RUN pip3 install --timeout=3600 -r /tmp/hub-requirements.txt  
+
+ADD https://raw.githubusercontent.com/haiwen/seafdav/master/requirements.txt /tmp/dav-requirements.txt
+
+RUN pip3 install --timeout=3600 -r /tmp/dav-requirements.txt
+
+COPY --from=riffol_build /usr/local/cargo/bin/riffol /usr/sbin/  
+
+RUN ln -s /opt/seafile/seafile-server-latest/seafile.sh /usr/bin/seafile  && \
+    ln -s /opt/seafile/seafile-server-latest/seahub.sh /usr/bin/seahub && \
+    ln -s /opt/seafile/pids /var/run/seafile   
+
+COPY riffol.conf /etc/riffol.conf
+
 COPY conf /opt/seafile/conf
 COPY conf /etc/seafile
 COPY nginx /etc/nginx
 COPY scripts/upgrade.py /usr/local/sbin/upgrade
-COPY scripts/seafile-server.sh /sbin/seafile-server
+COPY scripts/setup.sh /usr/bin/setup
 
 RUN ulimit -n 30000 && mkdir -p $SEAF/pids && \
-    chmod +x /usr/local/sbin/upgrade /sbin/seafile-server
+    chmod +x /usr/local/sbin/upgrade /usr/bin/setup
 
 ENV SEAF_UPGRADE_INTERVAL=3
 
-ENTRYPOINT ["/sbin/seafile-server"]
+ENTRYPOINT ["/usr/sbin/riffol", "-f", "/etc/riffol.conf"]
-#Defaults to run-upgrade options include: run, run-upgrade, upgrade, stop, stop-upgrade
-CMD ["run-upgrade"] 

nginx/seafile/media.conf

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

riffol.conf

@@ -0,0 +1,115 @@
+init seafile {
+    application_groups [seafile]
+}
+
+application_group seafile {
+    applications [
+        setup
+        seafile
+        seahub
+        nginx
+    ]
+}
+
+init seafile {
+    application_groups [seafile]
+}
+
+application_group seafile {
+    applications [
+        setup
+        seafile
+        seahub
+        nginx
+    ]
+}
+
+application setup {
+        mode oneshot
+        start [ /usr/bin/setup ]
+        dir /opt/seafile
+        env {
+                new {
+                        SEAF /opt/seafile
+                }
+                pass {
+                        SEAF_UPGRADE_INTERVAL SEAF_UPGRADE_INTERVAL
+                        SEAF_VERSION SEAF_VERSION
+                        SEAF_NAME SEAF_NAME
+                        SEAF_MYSQL SEAF_MYSQL
+                        SEAF_MYSQL_HOST SEAF_MYSQL_HOST
+                        SEAF_MYSQL_PORT SEAF_MYSQL_PORT
+                        SEAF_MYSQL_USER SEAF_MYSQL_USER
+                        SEAF_MYSQL_DB_SEAF SEAF_MYSQL_DB_SEAF     
+                        SEAF_MYSQL_DB_HUB SEAF_MYSQL_DB_HUB
+                        SEAF_MYSQL_DB_CCNET SEAF_MYSQL_DB_CCNET                                                                                                                                                                                                                                                                
+               }         
+        }
+}
+
+application seafile {
+        mode forking
+        pidfile /var/run/seafile/seaf-server.pid
+        requires [ setup ]
+        start [ /usr/bin/seafile, start ]
+        stop [ /usr/bin/seafile, stop ]
+        dir /opt/seafile
+        healthcheck [ server ]
+        healthcheckfail restart
+}
+
+application seahub {
+        mode forking
+        requires [ setup, seafile ]
+        pidfile /var/run/seafile/seahub.pid
+        start [ /usr/bin/seahub, start, 8000 ]
+        stop [ /usr/bin/seahub, stop ]
+        dir /opt/seafile
+        healthcheck [ hub ]
+        healthcheckfail restart
+}
+
+application nginx {
+        mode forking
+        pidfile /var/run/nginx.pid
+        requires [ setup, seahub ]
+        start [ /usr/sbin/nginx ] 
+        dir /opt/seafile
+        healthcheck [ http, hub ]
+        healthcheckfail restart
+}
+
+healthchecks riffol {
+    checks [
+        proc://riffol
+    ]
+    timeout 2
+    interval 1000
+}
+
+healthcheck http {
+        checks [
+                tcp://127.0.0.1:80
+        ]
+        interval 30
+        timeout 20
+}
+
+healthcheck hub {
+        checks [
+                tcp://127.0.0.1:8000
+                tcp://127.0.0.1:8080
+        ]
+        interval 80
+        timeout 60
+}
+
+healthcheck server {
+        checks [
+                tcp://127.0.0.1:8082
+                proc://ccnet-server
+                proc://seaf-server
+        ]
+        interval 10
+        timeout 5
+}

scripts/seafile-server.sh

@@ -1,194 +0,0 @@
-#!/bin/bash
-
-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")
-
-function stop {
- #Kill when hitting CTRL+C repeatedly
- trap stop_kill SIGTERM
- $0 stop
-}
-function stop_kill {
- $0 kill
-}
-function ext_url {
- echo "${SEAF_URL:-http://$(hostname)}/seafhttp"
-}
-function patch_seahub_conf {
- KEY="FILE_SERVER_ROOT"
- ENTRY="$KEY = '$(ext_url)'"
- CONF="$SEAF/conf/seahub_settings.py"
- grep "$KEY" -i "$CONF"
- if [ $? -eq 1 ]; then
-  echo "Patched seahub_settings.py: set $ENTRY"
-  echo -e "\n$ENTRY" >> "$CONF"
- fi
-}
-function last_update {
- if [ -e "$LATEST/install_date" ]; then 
-  date -d $(cat "$LATEST/install_date") "+%s"
- else
-  echo 0
- fi
-}
-
-function pid {
- for LOC in ${PIDFILES[@]}; do
-  if [ -e "$LOC/$1.pid" ]; then
-   cat "$LOC/$1.pid"
-   return 0
-  fi
- done
- pgrep -f "/$1"
-}
-
-case "$1" in
- run)
-  if [ ! -e "$LATEST" ]; then
-   (>&2 echo This appears to be the fist run, installing..)
-   mkdir -p $SEAF/conf
-   cp /etc/seafile/* $SEAF/conf/* -rf
-   $0 run-upgrade
-   exit $?
-  else
-   patch_seahub_conf
-   for CMD in "${COMMANDS[@]}"; do
-    INFO=($CMD)
-    $0 manage-component "${INFO[0]}" start "${INFO[1]}" "${INFO[@]:2}"
-   done
-   wait
-  fi
-  trap stop SIGINT SIGQUIT SIGTERM
-  LAST_UPGRADE=$(last_update)
-  UPGRADE=0
-  while eval "$0 status > /dev/null"; do
-    sleep 10;
-    SINCE_UPGRADE=$(((($(date "+%s") - $LAST_UPGRADE))/(60*60*24)))
-    if [ $LAST_UPGRADE -gt 0 ] && [ "0$SEAF_UPGRADE_INTERVAL" -gt 0 ] && [ $SINCE_UPGRADE -gt "0$SEAF_UPGRADE_INTERVAL" ]; then
-     echo "It's been $SINCE_UPGRADE days since the last Upgrade\nSTOPPING TO PERFORM UPGRADE NOW\nSet SEAF_UPGRADE_INTERVAL=0 disable automatic updates"
-     UPGRADE=1
-     $0 stop
-    fi
-  done
-  if [ $UPGRADE -eq 1 ]; then
-   $0 stop-upgrade-run
-  else
-   echo "Terminated"
-  fi
- ;;
- run-upgrade)
-  $0 upgrade
-  RES=$?
-  if [ $RES -eq 1 ]; then
-   echo "Failed upgrade"
-   exit 1
-  fi
-  if [ $RES -eq 127 ]; then
-   #No upgrade
-   true
-  fi
-  if [ $RES -eq 126 ] && [ ! -e "$LATEST/install_date" ]; then
-   date +%Y-%m-%d > "$LATEST/install_date"
-  fi
-  $0 run
- ;;
- stop)
-   PIDS=""
-   for CMD in seafile-controller ccnet seafdav "${COMMANDS[@]}" seafile-controller ccnet; do
-    $0 manage-component $(echo $CMD | cut -d' ' -f1) stop &
-    PIDS="$PIDS $!"
-   done
-   wait $PIDS
- ;;
- kill)
-   export SEAF_STOP_TRIES=0
-   $0 stop
- ;;
- stop-upgrade-run)
-  $0 stop && $0 upgrade && $0 run
- ;;
- upgrade)
-  /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
-    SERVICE="$(echo $CMD | cut -d' ' -f1)"
-    echo -n "$SERVICE: "
-    $0 manage-component $SERVICE status
-    [ $? -eq 0 ] || [ $RUNNING -eq 0 ]
-    RUNNING=$?
-   done
-   [ $RUNNING -eq 0 ]
- ;;
- manage-component)
-  mkdir -p /var/run/seafile
-  NAME="$2"
-  PID=$(pid $NAME)
-  case "$3" in
-   start)
-    CMD="$4"
-    ARGS="$5"
-    eval "$CMD $ARGS"
-    sleep 1
-    ( ! eval "$0 $1 $NAME status" ) && ((>&2 echo Failed to start $NAME); exit 1)
-   ;;
-   status)
-    (kill -0 $PID 2> /dev/null && echo Running) || (echo Stopped && exit 1)
-   ;;
-   stop)
-    QUERY="$0 $1 $NAME status > /dev/null"
-    if eval "$QUERY"; then
-     kill $PID
-     TRIES=${SEAF_STOP_TRIES:-30}
-     while eval "$QUERY"; do
-      TRIES=$((TRIES - 1))
-      if [ $TRIES -lt 1 ]; then
-       (>&2 echo Failed to stop gracefully $NAME)
-       kill -9 $PID
-       exit 1
-      else
-       kill $PID
-       [ $? -eq 1 ] && break
-      fi
-      sleep 1
-     done
-     (>&2 echo $NAME has been stopped)
-    else
-     (>&2 echo $NAME is not running)
-    fi
-   ;;
-   *)
-    echo "You're doing wrong pal"
-   ;;
-  esac
- ;;
- *)
- (>&2 echo Unknown option $1 options include: run, run-upgrade, upgrade, stop, stop-upgrade)
- ;;
-esac

scripts/setup.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+
+set -x
+
+LATEST=$SEAF/seafile-server-latest
+
+function ext_url {
+	echo "${SEAF_URL:-http://$(hostname)}/seafhttp"
+}
+function patch_seahub_conf {
+	KEY="FILE_SERVER_ROOT"
+	ENTRY="$KEY = '$(ext_url)'"
+	CONF="$SEAF/conf/seahub_settings.py"
+	grep "$KEY" -i "$CONF"
+	if [ $? -eq 1 ]; then
+		echo "Patched seahub_settings.py: set $ENTRY"
+		echo -e "\n$ENTRY" >> "$CONF"
+	fi
+}
+function last_update {
+	if [ -e "$LATEST/install_date" ]; then 
+		date -d $(cat "$LATEST/install_date") "+%s"
+	else
+		echo 1000000
+	fi
+}
+
+function timestamp {
+    date +%Y-%m-%d > "$LATEST/install_date"     
+}
+
+function revert {
+        rm -rf "$LATEST"
+}
+
+### Setup ###
+
+if [ ! -e "$LATEST" ]; then
+	(>&2 echo This appears to be the fist run, installing..)
+	trap revert ERR
+	mkdir -p $SEAF/conf
+        cp -f /etc/seafile/* /opt/seafile/conf/
+	/usr/local/sbin/upgrade main
+	RES="$?"
+	if [ "$RES" -eq 126 ]; then
+	        (>&2 echo Entering setup)
+                INSTALLDIR=$(cat $SEAF/ahead)
+                rm -rf $SEAF/ahead
+                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
+                cp -f /etc/seafile/* /opt/seafile/conf/	
+	        timestamp
+	        exit 0 
+	fi
+	if [ ! "$RES" -eq 1 ]; then 
+	        exit 0
+	fi
+	(>&2 echo "Installation failed")
+	exit 1
+else
+	LAST_UPGRADE=$(last_update)
+	SINCE_UPGRADE=$(((($(date "+%s") - $LAST_UPGRADE))/(60*60*24)))
+	if [ $LAST_UPGRADE -gt 0 ] && [ "0$SEAF_UPGRADE_INTERVAL" -gt 0 ] && [ $SINCE_UPGRADE -gt "0$SEAF_UPGRADE_INTERVAL" ]; then
+		(>&2 echo "It's been $SINCE_UPGRADE days since the last Upgrade\nPERFORMING UPGRADE NOW\nSet SEAF_UPGRADE_INTERVAL=0 disable automatic updates")
+		/usr/local/sbin/upgrade main
+		timestamp
+	fi
+	patch_seahub_conf
+fi

scripts/upgrade.py

@@ -55,11 +55,13 @@ def perform_upgrade_command(version,mysql=False,yes=True):
    scripts = os.path.join(seaf_home,"seafile-server-%s" % version, "upgrade")
    current = map(lambda x: int(x), current_version().split("."))
    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.")
+      #print("Running installer.")
-      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", os.path.join(seaf_home,"seafile-server-%s" % version) ],stdout=sys.stdout, stdin=sys.stdin):
-        sys.exit(1)
+      #  sys.exit(1)
+      crumb = open(seaf_home + "/ahead", 'w')
+      crumb.write(os.path.join(seaf_home,"seafile-server-%s" % version))
+      crumb.close()
       sys.exit(126)
    script_re = "^upgrade_(\d+).(\d+)_(\d+).(\d+)\.sh$"
    run = []
@@ -93,6 +95,7 @@ def download(url, version):
       return dest
    else:
       print("Download failed")
+      sys.exit(1)
       return 0
 
 def install_command(url, version):

seafile.service

@@ -10,30 +10,17 @@ MemoryLimit=512M
 
 Environment=ROOT_DIR=/srv/seafile
 Environment=SEAF_MYSQL=""			#Empty = Sqlite
-Environment=SEAF_HOST="localhost.localdomain"
 Environment=SEAF_URL="https://seaf.example.com"
 Environment=SEAF_UPGRADE_INTERVAL=10
-Environment=SEAF_PORT=8080
 
 #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 \
-### Rkt ###
-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:{SEAF_PORT} \
                        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"     
-ExecStop=/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)"
-
-### Docker ###
-#ExecStart=/usr/bin/docker run --name seafile --hostname ${SEAF_HOST} -e SEAF_MYSQL "${SEAF_MYSQL}" -e SEAF_URL "${SEAF_URL}" -e SEAF_HOST "${SEAF_HOST}" -e SEAF_UPGRADE_INTERVAL "${SEAF_UPGRADE_INTERVAL}" \
-#                                -v ${ROOT_DIR}:/opt/seafile -p 80:${SEAF_PORT} repo.shimun.net/shimun/seafile      
-#ExecStopPre=/bin/bash -c "docker stop seafile"        
-#ExecStopPost=/bin/bash -c "docker rm seafile" 
-
 ExecStopPost=/bin/rm ${ROOT_DIR}/container.uuid
 KillMode=mixed
 Restart=always