From 0deba82178b9b85e498e5d4c32721c691bc3e178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 6 Nov 2021 09:10:10 +0100 Subject: [PATCH] 12.0.0 (#79) * 12.0.0 --- README.md | 127 +++++++++--------- README_fr.md | 56 ++++++++ check_process | 1 - conf/app.src | 5 +- conf/ldap_plugin.src | 1 - conf/log_failed_logins_plugin.src | 1 - doc/DESCRIPTION.md | 1 + doc/DISCLAIMER.md | 9 ++ .../screenshots}/screenshot_Piwigo.jpg | Bin manifest.json | 17 ++- scripts/install | 1 + scripts/remove | 12 ++ scripts/restore | 2 - 13 files changed, 152 insertions(+), 81 deletions(-) create mode 100644 README_fr.md create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/DISCLAIMER.md rename {sources => doc/screenshots}/screenshot_Piwigo.jpg (100%) diff --git a/README.md b/README.md index 13325a5..e0a8c9b 100644 --- a/README.md +++ b/README.md @@ -1,67 +1,60 @@ -# Piwigo for YunoHost - -[![Integration level](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) -[![Install Piwigo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=piwigo) - -> *This package allow you to install Piwigo quickly and simply on a YunoHost server. -If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* - -## Overview - -[Piwigo](http://piwigo.org) is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. - -**Shipped version:** 11.5.0~ynh1 - -## Screenshots - -![](sources/screenshot_Piwigo.jpg) - -## Demo - -* [Official demo](http://piwigo.org/demo/) - -## Configuration - -## Documentation - - * Official documentation: https://piwigo.org/doc/doku.php - * YunoHost documentation: https://yunohost.org/#/app_piwigo - -## YunoHost specific features - -In addition to Piwigo core features, the following are made available with this package: - * Integrate with YunoHost users and SSO: - * private mode: limit access to YunoHost users - * public mode: - * SSO for YunoHost users - * allow other users management, and guest mode - * Allow one YunoHost user to be the administrator (set at the installation) - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/piwigo%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/piwigo/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/piwigo%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/piwigo/) - -## Limitations - -## Additionnal informations - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/piwigo_ynh/issues - * Piwigo website: http://piwigo.org/ - * Piwigo repository: https://github.com/Piwigo/Piwigo - * YunoHost website: https://yunohost.org/ - ---- - -## Developers infos - -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing). - -To try the testing branch, please proceed like that. -``` -sudo yunohost app install https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug -or -sudo yunohost app upgrade piwigo -u https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug -``` + + +# Piwigo for YunoHost + +[![Integration level](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) +[![Install Piwigo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) + +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install Piwigo quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* + +## Overview + +[Piwigo](http://piwigo.org) is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. + + +**Shipped version:** 12.0.0~ynh1 + +**Demo:** https://piwigo.org/demo + +## Screenshots + +![](./doc/screenshots/screenshot_Piwigo.jpg) + +## Disclaimers / important information + +## YunoHost specific features + +In addition to Piwigo core features, the following are made available with this package: + * Integrate with YunoHost users and SSO: + * private mode: limit access to YunoHost users + * public mode: + * SSO for YunoHost users + * allow other users management, and guest mode + * Allow one YunoHost user to be the administrator (set at the installation) + +## Documentation and resources + +* Official app website: http://piwigo.org +* Official admin documentation: https://piwigo.org/guides +* Upstream app code repository: https://github.com/Piwigo/Piwigo +* YunoHost documentation for this app: https://yunohost.org/app_piwigo +* Report a bug: https://github.com/YunoHost-Apps/piwigo_ynh/issues + +## Developer info + +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing). + +To try the testing branch, please proceed like that. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug +or +sudo yunohost app upgrade piwigo -u https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug +``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..0537769 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,56 @@ +# Piwigo pour YunoHost + +[![Niveau d'intégration](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) +[![Installer Piwigo avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) + +*[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* + +> *Ce package vous permet d'installer Piwigo 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 + +[Piwigo](http://piwigo.org) is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. + + +**Version incluse :** 12.0.0~ynh1 + +**Démo :** https://piwigo.org/demo + +## Captures d'écran + +![](./doc/screenshots/screenshot_Piwigo.jpg) + +## Avertissements / informations importantes + +## YunoHost specific features + +In addition to Piwigo core features, the following are made available with this package: + * Integrate with YunoHost users and SSO: + * private mode: limit access to YunoHost users + * public mode: + * SSO for YunoHost users + * allow other users management, and guest mode + * Allow one YunoHost user to be the administrator (set at the installation) + +## Documentations et ressources + +* Site officiel de l'app : http://piwigo.org +* Documentation officielle de l'admin : https://piwigo.org/guides +* Dépôt de code officiel de l'app : https://github.com/Piwigo/Piwigo +* Documentation YunoHost pour cette app : https://yunohost.org/app_piwigo +* Signaler un bug : https://github.com/YunoHost-Apps/piwigo_ynh/issues + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug +ou +sudo yunohost app upgrade piwigo -u https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug +``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/check_process b/check_process index 3fac6e1..2d0a4e8 100644 --- a/check_process +++ b/check_process @@ -16,7 +16,6 @@ upgrade=1 from_commit=d28c7cd4613a7455f316c91920a065676730ca46 backup_restore=1 multi_instance=1 - port_already_use=0 change_url=1 ;;; Options Email= diff --git a/conf/app.src b/conf/app.src index 6d61b68..dfadea6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,5 @@ -SOURCE_URL=https://piwigo.org/download/dlcounter.php?code=11.5.0 -SOURCE_SUM=bfecdd743c62cdb4e1936662178d019af264ea763d26c8c832da836fbe09652d +SOURCE_URL=https://piwigo.org/download/dlcounter.php?code=12.0.0 +SOURCE_SUM=cb711819cfcc931e79f975cef1fc12f7d1289d2d260455af1aac91419858e68f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/conf/ldap_plugin.src b/conf/ldap_plugin.src index 153525a..53d6c2f 100644 --- a/conf/ldap_plugin.src +++ b/conf/ldap_plugin.src @@ -3,4 +3,3 @@ SOURCE_SUM=3c22652f6c0653aaeebe239435796748ee57612ad44e8e5f2553277545d36e5e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/conf/log_failed_logins_plugin.src b/conf/log_failed_logins_plugin.src index dca4e7a..bbef4e6 100644 --- a/conf/log_failed_logins_plugin.src +++ b/conf/log_failed_logins_plugin.src @@ -3,4 +3,3 @@ SOURCE_SUM=85b9a06f2c7ca8ae9698e6151c7631f519c945f696b02da72f9ff53243d7e4ca SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false -SOURCE_FILENAME= diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..35de39e --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +[Piwigo](http://piwigo.org) is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..13b8600 --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,9 @@ +## YunoHost specific features + +In addition to Piwigo core features, the following are made available with this package: + * Integrate with YunoHost users and SSO: + * private mode: limit access to YunoHost users + * public mode: + * SSO for YunoHost users + * allow other users management, and guest mode + * Allow one YunoHost user to be the administrator (set at the installation) diff --git a/sources/screenshot_Piwigo.jpg b/doc/screenshots/screenshot_Piwigo.jpg similarity index 100% rename from sources/screenshot_Piwigo.jpg rename to doc/screenshots/screenshot_Piwigo.jpg diff --git a/manifest.json b/manifest.json index cc8bab3..1d53d7b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,8 +6,15 @@ "en": "Open source photo gallery for the web", "fr": "Galerie de photos open source pour le web" }, - "version": "11.5.0~ynh1", + "version": "12.0.0~ynh1", "url": "http://piwigo.org", + "upstream": { + "license": "GPL-2.0", + "website": "http://piwigo.org", + "demo": "https://piwigo.org/demo", + "admindoc": "https://piwigo.org/guides", + "code": "https://github.com/Piwigo/Piwigo" + }, "license": "GPL-2.0", "maintainer": { "name": "JimboJoe", @@ -15,7 +22,7 @@ "url": "" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.2.3" }, "multi_instance": true, "services": [ @@ -27,8 +34,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", @@ -38,8 +44,7 @@ }, { "name": "admin", - "type": "user", - "example": "homer" + "type": "user" }, { "name": "is_public", diff --git a/scripts/install b/scripts/install index 3ab6de3..7a0c80a 100644 --- a/scripts/install +++ b/scripts/install @@ -101,6 +101,7 @@ mkdir $final_path cp -a $tmpdir/!(upload|_data|galleries) $final_path datapath=/home/yunohost.app/$app + mkdir -p $datapath/_data mkdir -p $datapath/upload mkdir -p $datapath/galleries diff --git a/scripts/remove b/scripts/remove index c6ebafb..dbba742 100644 --- a/scripts/remove +++ b/scripts/remove @@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name final_path=$(ynh_app_setting_get --app=$app --key=final_path) +datapath=$(ynh_app_setting_get --app=$app --key=datapath) #================================================= # STANDARD REMOVE @@ -47,6 +48,17 @@ ynh_script_progression --message="Removing app main directory..." # Remove the app directory securely ynh_secure_remove --file="$final_path" +#================================================= +# 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..." --weight=1 + ynh_secure_remove --file="$datapath" +fi + #================================================= # REMOVE NGINX CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 5d7a112..5f11de8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -37,8 +37,6 @@ datapath=$(ynh_app_setting_get --app=$app --key=datapath) #================================================= ynh_script_progression --message="Validating restoration parameters..." -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 "