Merge branch 'testing' into 7.1

This commit is contained in:
Josué Tille 2020-11-17 21:57:28 +01:00
commit 5903b0cbae
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
3 changed files with 9 additions and 8 deletions

View file

@ -1,7 +1,7 @@
Seafile For yunohost Seafile For yunohost
================= =================
[![Integration level](https://dash.yunohost.org/integration/seafile.svg)](https://ci-apps.yunohost.org/ci/apps/seafile%20%28Community%29/lastBuild/consoleFull) [![Integration level](https://dash.yunohost.org/integration/seafile.svg)](https://dash.yunohost.org/appci/app/seafile) ![](https://ci-apps.yunohost.org/ci/badges/seafile.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/seafile.maintain.svg)
[![Install seafile with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=seafile) [![Install seafile with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=seafile)
> *This package allow you to install seafile quickly and simply on a YunoHost server. > *This package allow you to install seafile quickly and simply on a YunoHost server.
@ -59,11 +59,10 @@ for more information.
Since seafile 6.3 the i386 architecture is no more supported. Since seafile 6.3 the i386 architecture is no more supported.
Seafile no longer distribute binary for generic armhf architectures but rpi binary could work. Seafile don't distribute binary for generic armhf architectures but rpi binary generally work on all arm board.
* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/seafile%20(Community).svg)](https://ci-apps.yunohost.org/ci/apps/seafile/) * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/seafile%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/seafile/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/seafile%20(Community).svg)](https://ci-apps-arm.yunohost.org/ci/apps/seafile/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/seafile%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/seafile/)
* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/jenkins/job/seafile%20(Community).svg)](https://ci-stretch.nohost.me/jenkins/job/seafile/)
<!--Limitations <!--Limitations
------------ ------------

View file

@ -100,6 +100,8 @@ chmod +x expect_scripts/install.exp
chmod +x $final_path/seafile-server-$seafile_version/setup-seafile-mysql.sh chmod +x $final_path/seafile-server-$seafile_version/setup-seafile-mysql.sh
expect_scripts/install.exp "$final_path/seafile-server-$seafile_version" "$server_name" "$domain" "$seafile_data" "$fileserver_port" "$db_pwd" expect_scripts/install.exp "$final_path/seafile-server-$seafile_version" "$server_name" "$domain" "$seafile_data" "$fileserver_port" "$db_pwd"
sleep 3
# Update seafile config # Update seafile config
ynh_replace_string --match_string http:// --replace_string https:// --target_file $final_path/conf/ccnet.conf ynh_replace_string --match_string http:// --replace_string https:// --target_file $final_path/conf/ccnet.conf
ynh_replace_string --match_string :8000 --replace_string $path_url --target_file $final_path/conf/ccnet.conf ynh_replace_string --match_string :8000 --replace_string $path_url --target_file $final_path/conf/ccnet.conf

View file

@ -71,10 +71,10 @@ if [ $final_path == "/var/www/$app" ]; then
ynh_app_setting_set --app $app --key final_path --value $final_path ynh_app_setting_set --app $app --key final_path --value $final_path
test -e /var/log/seafile && rm /var/log/$app test -e /var/log/seafile && rm /var/log/$app
if ! [ -z "$(ls -A $final_path/seafile_data)" ]; then if ! [ -z "$(ls -A $final_path/seafile_data)" ]; then
# Data directory empty, so considere that all data are already in /home/yunohost.app/seafile # Data directory NOT empty, transfer data to /home/yunohost.app/seafile
mv /opt/yunohost/$app/seafile-data/* /home/yunohost.app/seafile-data/ mv $final_path/seafile_data/* /home/yunohost.app/seafile-data/
ynh_secure_remove $final_path/seafile_data ynh_secure_remove $final_path/seafile_data
ln -s $seafile_data $final_path/seafile_data ln -s /home/yunohost.app/seafile-data $final_path/
fi fi
ln -s $final_path/logs /var/log/seafile ln -s $final_path/logs /var/log/seafile
set_permission set_permission