LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
19950 Commits
1 Branch
46 MiB
Tree: f263976376
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'f263976376'
${ noResults }
openwrt-packages-dist/net/seafile-server/patches/021-bin-paths.patch

104 lines
3.9 KiB
Raw Normal View History

seafile-server: Update to 7.1.2, revamp package * Package scripts that are shipped by upstream in their binary download * Includes setup scripts (setup-seafile.sh to use SQLite, setup-seafile-mysql.{sh,py} to use MySQL) and control scripts (seafile.sh, seahub.sh) * Does not include seafile-admin, which is not shipped in upstream's binary download. Combined with the fact that it hasn't been updated to Python 3 suggests the script has been abandoned. * Replace previous init scripts with a simplified script * Previous init scripts (seafile.init, seahub.init) were modified from older versions of seafile.sh and seahub.sh, but they haven't kept up with changes to upstream's scripts * New init script (seafile-server.init) start/stops both Seafile and Seahub (there is no need to control them separately) by calling upstream's control scripts * Replace previous package config file with new config file * Options in previous config file (seafile.conf) were mainly for using Seahub in FastCGI mode. FastCGI was deprecated in Django 1.7 and removed in 1.9; upstream's control script will only start Seahub using Gunicorn. (Options for Gunicorn including port number can be changed by editing /etc/seafile/conf/gunicorn.conf.py.) * New config file (seafile-server.config) has one option that controls where the Seafile/Seahub data directories are stored * Patch scripts/binaries to use standard, system-wide directory locations * Script files (wrappers for binaries) in /usr/bin * Binaries (not meant to be run directly by the user) in /usr/libexec * Config files in /etc/seafile * Pid/socket files in /var/run/seafile * Logs in /var/log/seafile * Include a new script to create the first admin account * With upstream's original scripts, the user is required to interactively create the first admin account when Seahub is started for the first time * The user will now use the new script (create-seafile-admin.sh) to create the first admin account after setup (using setup-seafile.sh or setup-seafile-mysql.sh) and before starting Seafile/Seahub * seahub.sh is patched to only check if there is at least one admin account and exit with an error if there is no admin account * Remove build config options and add seafile-server-fuse package * The console option controls whether the console window is shown when Seafile server is run on Windows. It has no use on Linux. * The fuse option controls whether seaf-fuse is built. (seaf-fuse is a FUSE implementation that allows the Seafile database/file system to be mounted to a local directory.) seaf-fuse is now always built and is available in a separate package (seafile-server-fuse). * Add myself as a maintainer Signed-off-by: Jeffery To <jeffery.to@gmail.com>
5 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 
  1. --- a/scripts/seaf-fsck.sh

  2. +++ b/scripts/seaf-fsck.sh

  3. @@ -8,9 +8,9 @@ TOPDIR=$(dirname "${INSTALLPATH}")

  4.  default_ccnet_conf_dir=${TOPDIR}/ccnet
  5.  default_seafile_data_dir=${TOPDIR}/seafile-data
  6.  default_conf_dir=${TOPDIR}/conf
  7. -seaf_fsck=${INSTALLPATH}/seafile/bin/seaf-fsck

  8. +seaf_fsck=/usr/libexec/seaf-fsck

  9.  
  10. -export PATH=${INSTALLPATH}/seafile/bin:$PATH

  11. +export PATH=/usr/libexec:$PATH

  12.  export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH}
  13.  
  14.  script_name=$0
  15. --- a/scripts/seaf-fuse.sh

  16. +++ b/scripts/seaf-fuse.sh

  17. @@ -8,9 +8,9 @@ TOPDIR=$(dirname "${INSTALLPATH}")

  18.  default_ccnet_conf_dir=${TOPDIR}/ccnet
  19.  default_seafile_data_dir=${TOPDIR}/seafile-data
  20.  default_conf_dir=${TOPDIR}/conf
  21. -seaf_fuse=${INSTALLPATH}/seafile/bin/seaf-fuse

  22. +seaf_fuse=/usr/libexec/seaf-fuse

  23.  
  24. -export PATH=${INSTALLPATH}/seafile/bin:$PATH

  25. +export PATH=/usr/libexec:$PATH

  26.  export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH}
  27.  
  28.  script_name=$0
  29. --- a/scripts/seaf-gc.sh

  30. +++ b/scripts/seaf-gc.sh

  31. @@ -8,10 +8,10 @@ TOPDIR=$(dirname "${INSTALLPATH}")

  32.  default_ccnet_conf_dir=${TOPDIR}/ccnet
  33.  default_seafile_data_dir=${TOPDIR}/seafile-data
  34.  default_conf_dir=${TOPDIR}/conf
  35. -seaf_gc=${INSTALLPATH}/seafile/bin/seafserv-gc

  36. +seaf_gc=/usr/libexec/seafserv-gc

  37.  seaf_gc_opts=""
  38.  
  39. -export PATH=${INSTALLPATH}/seafile/bin:$PATH

  40. +export PATH=/usr/libexec:$PATH

  41.  export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH}
  42.  
  43.  script_name=$0
  44. --- a/scripts/seafile.sh

  45. +++ b/scripts/seafile.sh

  46. @@ -18,9 +18,9 @@ TOPDIR=$(dirname "${INSTALLPATH}")

  47.  default_ccnet_conf_dir=${TOPDIR}/ccnet
  48.  default_seafile_data_dir=${TOPDIR}/seafile-data
  49.  central_config_dir=${TOPDIR}/conf
  50. -seaf_controller="${INSTALLPATH}/seafile/bin/seafile-controller"

  51. +seaf_controller="/usr/libexec/seafile-controller"

  52.  
  53. -export PATH=${INSTALLPATH}/seafile/bin:$PATH

  54. +export PATH=/usr/libexec:$PATH

  55.  export ORIG_LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
  56.  export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH}
  57.  
  58. --- a/scripts/seahub.sh

  59. +++ b/scripts/seahub.sh

  60. @@ -25,7 +25,7 @@ gunicorn_conf=${TOPDIR}/conf/gunicorn.co

  61.  pidfile=${TOPDIR}/pids/seahub.pid
  62.  errorlog=${TOPDIR}/logs/gunicorn_error.log
  63.  accesslog=${TOPDIR}/logs/gunicorn_access.log
  64. -gunicorn_exe=${INSTALLPATH}/seahub/thirdpart/bin/gunicorn

  65. +gunicorn_exe=/usr/bin/gunicorn3

  66.  
  67.  script_name=$0
  68.  function usage () {
  69. @@ -233,9 +233,9 @@ function clear_sessions () {

  70.  function stop_seahub () {
  71.      if [[ -f ${pidfile} ]]; then
  72.          echo "Stopping seahub ..."
  73. -        pkill -9 -f "thirdpart/bin/gunicorn"

  74. +        pkill -9 -f "/usr/bin/gunicorn3"

  75.          sleep 1
  76. -        if pgrep -f "thirdpart/bin/gunicorn" 2>/dev/null 1>&2 ; then

  77. +        if pgrep -f "/usr/bin/gunicorn3" 2>/dev/null 1>&2 ; then

  78.              echo 'Failed to stop seahub.'
  79.              exit 1
  80.          fi
  81. --- a/scripts/setup-seafile-mysql.py

  82. +++ b/scripts/setup-seafile-mysql.py

  83. @@ -299,7 +299,7 @@ class EnvManager(object):

  84.      def __init__(self):
  85.          self.install_path = os.path.dirname(os.path.abspath(__file__))
  86.          self.top_dir = os.path.dirname(self.install_path)
  87. -        self.bin_dir = os.path.join(self.install_path, 'seafile', 'bin')

  88. +        self.bin_dir = '/usr/libexec'

  89.          self.central_config_dir = os.path.join(self.top_dir, 'conf')
  90.          self.central_pids_dir = os.path.join(self.top_dir, 'pids')
  91.          self.central_logs_dir = os.path.join(self.top_dir, 'logs')
  92. --- a/scripts/setup-seafile.sh

  93. +++ b/scripts/setup-seafile.sh

  94. @@ -455,8 +455,8 @@ if [[ "${need_pause}" == "1" ]]; then

  95.      read dummy
  96.  fi
  97.  
  98. -ccnet_init=${INSTALLPATH}/seafile/bin/ccnet-init

  99. -seaf_server_init=${INSTALLPATH}/seafile/bin/seaf-server-init

  100. +ccnet_init=/usr/libexec/ccnet-init

  101. +seaf_server_init=/usr/libexec/seaf-server-init

  102.  
  103.  # -------------------------------------------
  104.  # Create ccnet conf