diff --git a/README.md b/README.md index 5a33087..91b73d7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Seafile for YunoHost -[![Integration level](https://dash.yunohost.org/integration/seafile.svg)](https://dash.yunohost.org/appci/app/seafile) ![Working status](https://ci-apps.yunohost.org/ci/badges/seafile.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/seafile.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/seafile.svg)](https://dash.yunohost.org/appci/app/seafile) ![Working status](https://ci-apps.yunohost.org/ci/badges/seafile.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/seafile.maintain.svg) [![Install Seafile with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=seafile) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 5a27aaa..69420d2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,15 @@ It shall NOT be edited by hand. # Seafile pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/seafile.svg)](https://dash.yunohost.org/appci/app/seafile) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/seafile.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/seafile.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/seafile.svg)](https://dash.yunohost.org/appci/app/seafile) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/seafile.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/seafile.maintain.svg) [![Installer Seafile avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=seafile) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Seafile rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Seafile rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Seafile is an open Source Cloud Storage application. @@ -24,16 +24,16 @@ It's a Enterprise file sync and share platform with high reliability and perform **Démo :** https://demo.seafile.com -## Captures d'écran +## Captures d’écran -![Capture d'écran de Seafile](./doc/screenshots/mobile-ios-client.jpg) -![Capture d'écran de Seafile](./doc/screenshots/drive-client.png) -![Capture d'écran de Seafile](./doc/screenshots/file-locking.jpg) -![Capture d'écran de Seafile](./doc/screenshots/access-logs.jpg) -![Capture d'écran de Seafile](./doc/screenshots/file-history.png) -![Capture d'écran de Seafile](./doc/screenshots/wiki_en.png) -![Capture d'écran de Seafile](./doc/screenshots/sharing-dialog.png) -![Capture d'écran de Seafile](./doc/screenshots/sync-client.jpg) +![Capture d’écran de Seafile](./doc/screenshots/mobile-ios-client.jpg) +![Capture d’écran de Seafile](./doc/screenshots/drive-client.png) +![Capture d’écran de Seafile](./doc/screenshots/file-locking.jpg) +![Capture d’écran de Seafile](./doc/screenshots/access-logs.jpg) +![Capture d’écran de Seafile](./doc/screenshots/file-history.png) +![Capture d’écran de Seafile](./doc/screenshots/wiki_en.png) +![Capture d’écran de Seafile](./doc/screenshots/sharing-dialog.png) +![Capture d’écran de Seafile](./doc/screenshots/sync-client.jpg) ## Avertissements / informations importantes @@ -137,9 +137,9 @@ TODO ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -155,4 +155,4 @@ ou sudo yunohost app upgrade seafile -u https://github.com/YunoHost-Apps/seafile_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index f901cf4..6f2ee35 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,6 +15,11 @@ install_source() { ynh_die --message "Error : this architecture is no longer supported by the upstream. Please create en issue here : https://github.com/YunoHost-Apps/seafile_ynh/issues to ask to discuss about a support of this architecture" fi ynh_setup_source "$final_path/seafile-server-$seafile_version" "$YNH_ARCH" + + # Drop some conflicting package cf: https://forum.seafile.com/t/seahub-fails-to-start-nameerror-name-mysql-is-not-defined/14566/3 + ynh_secure_remove --file=$final_path/seafile-server-$seafile_version/seahub/thirdpart/MySQLdb + ynh_secure_remove --file=$final_path/seafile-server-$seafile_version/seahub/thirdpart/cffi + ynh_secure_remove --file=$final_path/seafile-server-$seafile_version/seahub/thirdpart/PIL } install_source_7_0() { @@ -56,9 +61,10 @@ set_permission() { chmod -R g-wx,o= $final_path setfacl -m user:www-data:rX $final_path setfacl -m user:www-data:rX $final_path/seafile-server-$seafile_version - setfacl -m user:www-data:rX $final_path/seafile-server-latest/seahub - setfacl -R -m user:www-data:rX $final_path/seafile-server-latest/seahub/media - setfacl -R -m user:www-data:rX $final_path/seahub-data + # At install time theses directory are not available + test -e $final_path/seafile-server-latest/seahub && setfacl -m user:www-data:rX $final_path/seafile-server-latest/seahub + test -e $final_path/seafile-server-latest/seahub/media && setfacl -R -m user:www-data:rX $final_path/seafile-server-latest/seahub/media + test -e $final_path/seahub-data && setfacl -R -m user:www-data:rX $final_path/seahub-data # check that this directory exist because in some really old install the data could still be in the main seafile directory # We also check at the install time when data directory is not already initialised diff --git a/scripts/install b/scripts/install index 0aabce2..5023e1b 100644 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,8 @@ ynh_script_progression --message="Configuring application..." --weight=3 # Run install script mv_expect_scripts chmod +x $final_path/seafile-server-$seafile_version/setup-seafile-mysql.sh -$expect_scripts_dir/install.exp "$final_path/seafile-server-$seafile_version" "$server_name" "$domain" "$fileserver_port" "$db_pwd" +set_permission +sudo -u $seafile_user $expect_scripts_dir/install.exp "$final_path/seafile-server-$seafile_version" "$server_name" "$domain" "$fileserver_port" "$db_pwd" sleep 3