diff --git a/seafile-server-centos-7-amd64-http b/seafile-server-centos-7-amd64-http index 75f494c..075577f 100644 --- a/seafile-server-centos-7-amd64-http +++ b/seafile-server-centos-7-amd64-http @@ -173,12 +173,7 @@ systemctl status firewalld &> /dev/null \ yum install epel-release -y yum upgrade -y -if [[ ${SEAFILE_VERSION} =~ 7\.[0-9]*\.[0-9]* ]]; then - yum install python-setuptools MySQL-python memcached python-urllib3 \ - pwgen curl openssl python-ldap java-1.8.0-openjdk poppler-utils libreoffice \ - libreoffice-headless libreoffice-pyuno wqy-microhei-fonts wqy-zenhei-fonts wqy-unibit-fonts \ - libffi-devel openssl-devel libmemcached -y -else +if [[ ${SEAFILE_VERSION} =~ 6\.[0-9]*\.[0-9]* ]]; then yum install python-setuptools MySQL-python memcached python-urllib3 \ pwgen curl openssl python-ldap java-1.8.0-openjdk poppler-utils libreoffice python-requests \ libreoffice-headless libreoffice-pyuno wqy-microhei-fonts wqy-zenhei-fonts wqy-unibit-fonts \ @@ -187,6 +182,11 @@ else pip install pylibmc==1.6.0 django-pylibmc==0.6.1 pip install --timeout=3600 Pillow==4.3.0 pip install psd-tools==1.4 +else + yum install python-setuptools MySQL-python memcached python-urllib3 \ + pwgen curl openssl python-ldap java-1.8.0-openjdk poppler-utils libreoffice \ + libreoffice-headless libreoffice-pyuno wqy-microhei-fonts wqy-zenhei-fonts wqy-unibit-fonts \ + libffi-devel openssl-devel libmemcached -y fi # start memcached on system boot diff --git a/seafile-server-ubuntu-amd64-http b/seafile-server-ubuntu-amd64-http index ec5561a..2b99d42 100644 --- a/seafile-server-ubuntu-amd64-http +++ b/seafile-server-ubuntu-amd64-http @@ -143,11 +143,7 @@ fi # ------------------------------------------- apt-get update -if [[ ${SEAFILE_VERSION} =~ 7\.[0-9]*\.[0-9]* ]]; then - apt-get install -y python2.7 sudo python-setuptools python-mysqldb python-ldap python-urllib3 \ - openjdk-8-jre memcached libmemcached-dev zlib1g-dev pwgen curl openssl poppler-utils libpython2.7 libreoffice \ - libreoffice-script-provider-python ttf-wqy-microhei ttf-wqy-zenhei xfonts-wqy nginx -else +if [[ ${SEAFILE_VERSION} =~ 6\.[0-9]*\.[0-9]* ]]; then apt-get install -y python2.7 sudo python-pip python-setuptools python-mysqldb python-ldap python-urllib3 \ openjdk-8-jre memcached libmemcached-dev zlib1g-dev pwgen curl openssl poppler-utils libpython2.7 libreoffice \ libreoffice-script-provider-python ttf-wqy-microhei ttf-wqy-zenhei xfonts-wqy nginx python-requests @@ -155,6 +151,10 @@ else pip install pylibmc==1.6.0 django-pylibmc==0.6.1 pip install --timeout=3600 Pillow==4.3.0 pip install psd-tools==1.4 +else + apt-get install -y python2.7 sudo python-setuptools python-mysqldb python-ldap python-urllib3 \ + openjdk-8-jre memcached libmemcached-dev zlib1g-dev pwgen curl openssl poppler-utils libpython2.7 libreoffice \ + libreoffice-script-provider-python ttf-wqy-microhei ttf-wqy-zenhei xfonts-wqy nginx fi rm /etc/nginx/sites-enabled/*