diff --git a/README.md b/README.md index 102fe19..b261449 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # pyLoad for YunoHost -[![Integration level](https://dash.yunohost.org/integration/pyload.svg)](https://dash.yunohost.org/appci/app/pyload) ![](https://ci-apps.yunohost.org/ci/badges/pyload.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/pyload.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/pyload.svg)](https://dash.yunohost.org/appci/app/pyload) ![Working status](https://ci-apps.yunohost.org/ci/badges/pyload.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pyload.maintain.svg) [![Install pyLoad with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pyload) *[Lire ce readme en français.](./README_fr.md)* @@ -18,13 +18,11 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in The free and open-source Download Manager written in pure Python -**Shipped version:** 0.4.20~ynh2 - - +**Shipped version:** 0.4.20~ynh3 ## Screenshots -![](./doc/screenshots/sample.png) +![Screenshot of pyLoad](./doc/screenshots/sample.png) ## Disclaimers / important information @@ -35,21 +33,22 @@ The free and open-source Download Manager written in pure Python ## Documentation and resources -* Official app website: https://pyload.net -* Official admin documentation: https://github.com/pyload/pyload/wiki -* Upstream app code repository: https://github.com/pyload/pyload -* YunoHost documentation for this app: https://yunohost.org/app_pyload -* Report a bug: https://github.com/YunoHost-Apps/pyload_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/pyload_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/pyload_ynh/tree/testing --debug or sudo yunohost app upgrade pyload -u https://github.com/YunoHost-Apps/pyload_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 905f149..7ce08c5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # pyLoad pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/pyload.svg)](https://dash.yunohost.org/appci/app/pyload) ![](https://ci-apps.yunohost.org/ci/badges/pyload.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/pyload.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/pyload.svg)](https://dash.yunohost.org/appci/app/pyload) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pyload.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pyload.maintain.svg) [![Installer pyLoad avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pyload) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer pyLoad 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.* @@ -14,13 +18,11 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour The free and open-source Download Manager written in pure Python -**Version incluse :** 0.4.20~ynh2 - - +**Version incluse :** 0.4.20~ynh3 ## Captures d'écran -![](./doc/screenshots/sample.png) +![Capture d'écran de pyLoad](./doc/screenshots/sample.png) ## Avertissements / informations importantes @@ -31,21 +33,22 @@ The free and open-source Download Manager written in pure Python ## Documentations et ressources -* Site officiel de l'app : https://pyload.net -* Documentation officielle de l'admin : https://github.com/pyload/pyload/wiki -* Dépôt de code officiel de l'app : https://github.com/pyload/pyload -* Documentation YunoHost pour cette app : https://yunohost.org/app_pyload -* Signaler un bug : https://github.com/YunoHost-Apps/pyload_ynh/issues +* 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 : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/pyload_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/pyload_ynh/tree/testing --debug ou sudo yunohost app upgrade pyload -u https://github.com/YunoHost-Apps/pyload_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** diff --git a/conf/nginx.conf b/conf/nginx.conf index 217b22f..106b49b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,8 +7,8 @@ location __PATH__/ { proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Host $server_name; - + proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; -} \ No newline at end of file +} diff --git a/manifest.json b/manifest.json index 19c657e..a627350 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Download Manager written in pure Python." }, - "version": "0.4.20~ynh2", + "version": "0.4.20~ynh3", "url": "https://pyload.net/", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/change_url b/scripts/change_url index a3d7544..5fba4c9 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -104,13 +104,6 @@ then ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi -#================================================= -# SPECIFIC MODIFICATIONS -#================================================= -# UPDATE A CONFIG FILE -#================================================= -ynh_script_progression --message="Updating a configuration file..." - #================================================= # GENERIC FINALISATION #================================================= diff --git a/scripts/install b/scripts/install index ded3e21..6ec2383 100644 --- a/scripts/install +++ b/scripts/install @@ -124,11 +124,6 @@ chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" -#================================================= -# ADD A CONFIGURATION -#================================================= -ynh_script_progression --message="Adding a configuration file..." - #================================================= # SETUP SYSTEMD #================================================= diff --git a/scripts/restore b/scripts/restore index f1702a4..1a34775 100644 --- a/scripts/restore +++ b/scripts/restore @@ -42,13 +42,6 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -91,6 +84,13 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # RESTORE SYSTEMD #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index bb059f8..fce7efe 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -66,6 +66,13 @@ ynh_script_progression --message="Making sure dedicated system user exists..." # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # NGINX CONFIGURATION #================================================= @@ -74,13 +81,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # SPECIFIC UPGRADE #================================================= @@ -98,11 +98,6 @@ pushd $final_path pip install --pre pyload-ng[all] popd -#================================================= -# UPDATE A CONFIG FILE -#================================================= -ynh_script_progression --message="Updating a configuration file..." - #================================================= # SETUP SYSTEMD #=================================================