diff --git a/README.md b/README.md index 3ac8677..58c02c4 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Indexhibit for YunoHost -[![Integration level](https://dash.yunohost.org/integration/indexhibit.svg)](https://dash.yunohost.org/appci/app/indexhibit) ![](https://ci-apps.yunohost.org/ci/badges/indexhibit.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/indexhibit.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/indexhibit.svg)](https://dash.yunohost.org/appci/app/indexhibit) ![Working status](https://ci-apps.yunohost.org/ci/badges/indexhibit.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/indexhibit.maintain.svg) [![Install Indexhibit with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=indexhibit) *[Lire ce readme en français.](./README_fr.md)* @@ -27,11 +27,9 @@ Indexhibit is not a 'platform' and there is no tracking or selling of your data. **Shipped version:** 2.1.6~ynh1 -**Demo:** https://demo.example.com - ## Screenshots -![](./doc/screenshots/146_indexhibit.png) +![Screenshot of Indexhibit](./doc/screenshots/146_indexhibit.png) ## Disclaimers / important information @@ -44,21 +42,22 @@ Admin area: `http://yourdomain.com/ndxz-studio` (where `yourdomain.com` is your ## Documentation and resources -* Official app website: https://www.indexhibit.org -* Official admin documentation: https://forum.indexhibit.org/tutorials/getting-started/installation/ -* Upstream app code repository: https://github.com/Indexhibit/indexhibit -* YunoHost documentation for this app: https://yunohost.org/app_indexhibit -* Report a bug: https://github.com/YunoHost-Apps/indexhibit_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/indexhibit_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/indexhibit_ynh/tree/testing --debug or sudo yunohost app upgrade indexhibit -u https://github.com/YunoHost-Apps/indexhibit_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 a6250e2..b5f07ac 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Indexhibit pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/indexhibit.svg)](https://dash.yunohost.org/appci/app/indexhibit) ![](https://ci-apps.yunohost.org/ci/badges/indexhibit.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/indexhibit.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/indexhibit.svg)](https://dash.yunohost.org/appci/app/indexhibit) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/indexhibit.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/indexhibit.maintain.svg) [![Installer Indexhibit avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=indexhibit) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Indexhibit 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.* @@ -23,11 +27,9 @@ Indexhibit is not a 'platform' and there is no tracking or selling of your data. **Version incluse :** 2.1.6~ynh1 -**Démo :** https://demo.example.com - ## Captures d'écran -![](./doc/screenshots/146_indexhibit.png) +![Capture d'écran de Indexhibit](./doc/screenshots/146_indexhibit.png) ## Avertissements / informations importantes @@ -40,21 +42,22 @@ Admin area: `http://yourdomain.com/ndxz-studio` (where `yourdomain.com` is your ## Documentations et ressources -* Site officiel de l'app : https://www.indexhibit.org -* Documentation officielle de l'admin : https://forum.indexhibit.org/tutorials/getting-started/installation/ -* Dépôt de code officiel de l'app : https://github.com/Indexhibit/indexhibit -* Documentation YunoHost pour cette app : https://yunohost.org/app_indexhibit -* Signaler un bug : https://github.com/YunoHost-Apps/indexhibit_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/indexhibit_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/indexhibit_ynh/tree/testing --debug ou sudo yunohost app upgrade indexhibit -u https://github.com/YunoHost-Apps/indexhibit_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/manifest.json b/manifest.json index c330de2..48ded60 100644 --- a/manifest.json +++ b/manifest.json @@ -9,19 +9,18 @@ "version": "2.1.6~ynh1", "url": "https://www.indexhibit.org", "upstream": { - "license": "free", + "license": "GPL-3.0-only", "website": "https://www.indexhibit.org", - "demo": "https://demo.example.com", "admindoc": "https://forum.indexhibit.org/tutorials/getting-started/installation/", "code": "https://github.com/Indexhibit/indexhibit" }, - "license": "free", + "license": "GPL-3.0-only", "maintainer": { "name": "", "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index 7251617..58a5b8c 100755 --- a/scripts/install +++ b/scripts/install @@ -89,14 +89,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -105,6 +97,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index d5493f3..c2f98db 100755 --- a/scripts/restore +++ b/scripts/restore @@ -48,13 +48,6 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -94,6 +87,13 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # RESTORE THE MYSQL DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index bb54e16..15b22c3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -86,21 +86,13 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/ndxzsite/config/config.php" + ynh_setup_source --dest_dir="$final_path" --keep="ndxzsite/config/config.php" fi chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -116,6 +108,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # RELOAD NGINX #=================================================