From 8d09a8ec079dcb3549f2117164fcfb4e3af47685 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 21 Sep 2021 23:12:27 +0200 Subject: [PATCH 1/3] Cleaning up --- manifest.json | 3 +-- scripts/restore | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index e914e05..7e5902f 100644 --- a/manifest.json +++ b/manifest.json @@ -34,8 +34,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", diff --git a/scripts/restore b/scripts/restore index 1c81c01..5fc92c1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -35,8 +35,6 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " From e8554b735cb6b6d4224565402a6f50cf9399a34e Mon Sep 17 00:00:00 2001 From: Galettofraise Date: Wed, 23 Feb 2022 16:43:10 +0100 Subject: [PATCH 2/3] [fix] Add --purge --- scripts/remove | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/remove b/scripts/remove index 6235979..43d473a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -29,6 +29,16 @@ ynh_secure_remove --file="$final_path" # Remove the content directory securely #ynh_secure_remove --file="/home/yunohost.app/$app" +#================================================= +# REMOVE DATA DIR +#================================================= + +# Remove the data directory if --purge option is used +if [ "${YNH_APP_PURGE:-0}" -eq 1 ] +then + ynh_script_progression --message="Removing app data directory..." --time --weight=1 + ynh_secure_remove --file="$datadir" +fi #================================================= # REMOVE NGINX CONFIGURATION From 5099a1c227ab41afdf44569daf6b2c45ff11b75c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 3 Jun 2022 23:16:14 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 21 +++++++++++---------- README_fr.md | 27 ++++++++++++++++----------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 54aa45c..1630775 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # ChuWiki for YunoHost -[![Integration level](https://dash.yunohost.org/integration/chuwiki.svg)](https://dash.yunohost.org/appci/app/chuwiki) ![](https://ci-apps.yunohost.org/ci/badges/chuwiki.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/chuwiki.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/chuwiki.svg)](https://dash.yunohost.org/appci/app/chuwiki) ![Working status](https://ci-apps.yunohost.org/ci/badges/chuwiki.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/chuwiki.maintain.svg) [![Install ChuWiki with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=chuwiki) *[Lire ce readme en français.](./README_fr.md)* @@ -23,7 +23,7 @@ A simple, fast and flexible wiki. ## Screenshots -![](./doc/screenshots/screenshot.png) +![Screenshot of ChuWiki](./doc/screenshots/screenshot.png) ## Disclaimers / important information @@ -33,22 +33,23 @@ How to configure this app: via the `/var/www/chuwiki/configuration.ini` file. ## Documentation and resources -* Official app website: http://chuwiki.genezys.net/ -* Official user documentation: https://yunohost.org/apps -* Official admin documentation: http://chuwiki.genezys.net/ -* Upstream app code repository: https://github.com/genezys/chuwiki -* YunoHost documentation for this app: https://yunohost.org/app_chuwiki -* Report a bug: https://github.com/YunoHost-Apps/chuwiki_ynh/issues +* Official app website: +* Official user documentation: +* 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/chuwiki_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/chuwiki_ynh/tree/testing --debug or sudo yunohost app upgrade chuwiki -u https://github.com/YunoHost-Apps/chuwiki_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 4ff7576..4822d44 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # ChuWiki pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/chuwiki.svg)](https://dash.yunohost.org/appci/app/chuwiki) ![](https://ci-apps.yunohost.org/ci/badges/chuwiki.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/chuwiki.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/chuwiki.svg)](https://dash.yunohost.org/appci/app/chuwiki) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/chuwiki.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/chuwiki.maintain.svg) [![Installer ChuWiki avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=chuwiki) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer ChuWiki 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.* @@ -19,7 +23,7 @@ Un wiki simple, rapide et flexible. ## Captures d'écran -![](./doc/screenshots/screenshot.png) +![Capture d'écran de ChuWiki](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -29,22 +33,23 @@ Comment configurer cette application : via le fichier `/var/www/chuwiki/configur ## Documentations et ressources -* Site officiel de l'app : http://chuwiki.genezys.net/ -* Documentation officielle utilisateur : https://yunohost.org/apps -* Documentation officielle de l'admin : http://chuwiki.genezys.net/ -* Dépôt de code officiel de l'app : https://github.com/genezys/chuwiki -* Documentation YunoHost pour cette app : https://yunohost.org/app_chuwiki -* Signaler un bug : https://github.com/YunoHost-Apps/chuwiki_ynh/issues +* Site officiel de l'app : +* Documentation officielle utilisateur : +* 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/chuwiki_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/chuwiki_ynh/tree/testing --debug ou sudo yunohost app upgrade chuwiki -u https://github.com/YunoHost-Apps/chuwiki_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 :**