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 1/6] 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 " From 2a082e78561cbf1798ab712a42db35044beaf1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Nov 2021 21:46:13 +0100 Subject: [PATCH 2/6] 12.1.0 (#81) * 12.1.0 * Auto-update README Co-authored-by: Yunohost-Bot <> --- README.md | 2 +- README_fr.md | 2 +- check_process | 6 +++--- conf/app.src | 4 ++-- manifest.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e0a8c9b..0a4c54c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in [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 +**Shipped version:** 12.1.0~ynh1 **Demo:** https://piwigo.org/demo diff --git a/README_fr.md b/README_fr.md index 0537769..d15d2fe 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour [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 +**Version incluse :** 12.1.0~ynh1 **Démo :** https://piwigo.org/demo diff --git a/check_process b/check_process index 2d0a4e8..1fd27ee 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=d28c7cd4613a7455f316c91920a065676730ca46 + upgrade=1 from_commit=bc9ab6f21a7dcaab9245ef5cbfc9d6c4bd026925 backup_restore=1 multi_instance=1 change_url=1 @@ -21,6 +21,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=d28c7cd4613a7455f316c91920a065676730ca46 - name=Upgrade to upstream version 2.9.5 + ; commit=bc9ab6f21a7dcaab9245ef5cbfc9d6c4bd026925 + name=12.0.0 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1& diff --git a/conf/app.src b/conf/app.src index dfadea6..4e4d5a1 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://piwigo.org/download/dlcounter.php?code=12.0.0 -SOURCE_SUM=cb711819cfcc931e79f975cef1fc12f7d1289d2d260455af1aac91419858e68f +SOURCE_URL=https://piwigo.org/download/dlcounter.php?code=12.1.0 +SOURCE_SUM=538c8b6974cf69720f683f082cf413db0e122e1ce52a81e491cd5145b8948e3c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 1d53d7b..d4327f7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source photo gallery for the web", "fr": "Galerie de photos open source pour le web" }, - "version": "12.0.0~ynh1", + "version": "12.1.0~ynh1", "url": "http://piwigo.org", "upstream": { "license": "GPL-2.0", From c991a485802d1b0ed0d2cf31cd9c166af27bf946 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 24 Jun 2022 05:33:16 +0200 Subject: [PATCH 3/6] Upgrade to 12.2.0~ynh1 --- README.md | 2 +- README_fr.md | 2 +- check_process | 11 +++++---- conf/app.src | 6 +++-- conf/nginx.conf | 12 ++++------ manifest.json | 16 ++++++------- scripts/_common.sh | 4 +--- scripts/backup | 12 +++++----- scripts/change_url | 2 +- scripts/install | 24 +++++++++---------- scripts/remove | 16 ++++++------- scripts/restore | 58 +++++++++++++++++++++------------------------- scripts/upgrade | 33 +++++++++++++------------- 13 files changed, 97 insertions(+), 101 deletions(-) diff --git a/README.md b/README.md index 0a4c54c..71747f3 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in [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.1.0~ynh1 +**Shipped version:** 12.2.0~ynh1 **Demo:** https://piwigo.org/demo diff --git a/README_fr.md b/README_fr.md index d15d2fe..cb07199 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour [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.1.0~ynh1 +**Version incluse :** 12.2.0~ynh1 **Démo :** https://piwigo.org/demo diff --git a/check_process b/check_process index 1fd27ee..68cf7a8 100644 --- a/check_process +++ b/check_process @@ -2,9 +2,9 @@ ; Manifest domain="domain.tld" path="/path" - admin="john" - language="fr" is_public=1 + language="fr" + admin="john" ; Checks pkg_linter=1 setup_sub_dir=1 @@ -13,14 +13,15 @@ setup_private=1 setup_public=1 upgrade=1 + # 12.0.0~ynh1 upgrade=1 from_commit=bc9ab6f21a7dcaab9245ef5cbfc9d6c4bd026925 + # 12.1.0~ynh1 + upgrade=1 from_commit=cd09a41142c55f4d4c0e654574ccb3e9d1ad3f91 backup_restore=1 multi_instance=1 + port_already_use=0 change_url=1 ;;; Options Email= Notification=none ;;; Upgrade options - ; commit=bc9ab6f21a7dcaab9245ef5cbfc9d6c4bd026925 - name=12.0.0 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1& diff --git a/conf/app.src b/conf/app.src index 4e4d5a1..4e07bb6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,7 @@ -SOURCE_URL=https://piwigo.org/download/dlcounter.php?code=12.1.0 -SOURCE_SUM=538c8b6974cf69720f683f082cf413db0e122e1ce52a81e491cd5145b8948e3c +SOURCE_URL=https://piwigo.org/download/dlcounter.php?code=12.2.0 +SOURCE_SUM=824ee83f46654b68962263567f2957933d75b2bac016e6dbb9ea9df9a2a86e88 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index f33ff98..28469eb 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,15 +2,13 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/ ; + alias __FINALPATH__/; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - - client_max_body_size 100M; index index.php; + + # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file + client_max_body_size 100M; + default_type text/html; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; diff --git a/manifest.json b/manifest.json index d4327f7..d93ad5d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source photo gallery for the web", "fr": "Galerie de photos open source pour le web" }, - "version": "12.1.0~ynh1", + "version": "12.2.0~ynh1", "url": "http://piwigo.org", "upstream": { "license": "GPL-2.0", @@ -22,7 +22,7 @@ "url": "" }, "requirements": { - "yunohost": ">= 4.2.3" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -31,7 +31,7 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" @@ -42,10 +42,6 @@ "example": "/piwigo", "default": "/piwigo" }, - { - "name": "admin", - "type": "user" - }, { "name": "is_public", "type": "boolean", @@ -60,7 +56,11 @@ }, "choices": ["de", "en", "es", "fr", "it", "pt"], "default": "en" - } + }, + { + "name": "admin", + "type": "user" + } ] } } diff --git a/scripts/_common.sh b/scripts/_common.sh index 27ce9e1..056bb7f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,9 +7,7 @@ YNH_PHP_VERSION="7.3" # dependencies used by the app -pkg_dependencies="imagemagick" - -extra_php_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysqli" +pkg_dependencies="imagemagick php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysqli" #================================================= # PERSONAL HELPERS diff --git a/scripts/backup b/scripts/backup index 9cf719f..3ab9f0b 100644 --- a/scripts/backup +++ b/scripts/backup @@ -41,6 +41,12 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$final_path" +#================================================= +# BACKUP THE DATA DIR +#================================================= + +ynh_backup --src_path="$datapath" --is_big + #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= @@ -60,12 +66,6 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" -#================================================= -# BACKUP THE DATA DIRECTORY -#================================================= - -ynh_backup --src_path="$datapath" --is_big - #================================================= # BACKUP THE MYSQL DATABASE #================================================= diff --git a/scripts/change_url b/scripts/change_url index 243e746..58c7fa5 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -48,7 +48,7 @@ fi #================================================= # STANDARD MODIFICATIONS #================================================= -# MODIFY URL IN NGINX CONF FILE +# MODIFY URL IN NGINX CONF #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2 diff --git a/scripts/install b/scripts/install index 7a0c80a..7a7797e 100644 --- a/scripts/install +++ b/scripts/install @@ -22,9 +22,9 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH -admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE +admin=$YNH_APP_ARG_ADMIN app=$YNH_APP_INSTANCE_NAME @@ -46,9 +46,9 @@ ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=is_public --value=$is_public ynh_app_setting_set --app=$app --key=language --value=$language +ynh_app_setting_set --app=$app --key=admin --value=$admin #================================================= # STANDARD MODIFICATIONS @@ -65,7 +65,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Configuring system user..." --weight=3 # Create a system user -ynh_system_user_create --username=$app --home_dir=$final_path +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # CREATE A MYSQL DATABASE @@ -126,6 +126,15 @@ ynh_app_setting_set --app=$app --key=datapath --value=$datapath ynh_secure_remove --file="$tmpdir" +#================================================= +# PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 + +# Create a dedicated PHP-FPM config +ynh_add_fpm_config +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) + #================================================= # NGINX CONFIGURATION #================================================= @@ -134,15 +143,6 @@ ynh_script_progression --message="Configuring NGINX web server..." # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 - -# Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - #================================================= # SPECIFIC SETUP #================================================= diff --git a/scripts/remove b/scripts/remove index dbba742..b7608a5 100644 --- a/scripts/remove +++ b/scripts/remove @@ -32,14 +32,6 @@ ynh_script_progression --message="Removing the MySQL database..." # Remove a database if it exists, along with the associated user ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - #================================================= # REMOVE APP MAIN DIR #================================================= @@ -75,6 +67,14 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." # Remove the dedicated PHP-FPM config ynh_remove_fpm_config +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." + +# Remove metapackage and its dependencies +ynh_remove_app_dependencies + #================================================= # REMOVE FAIL2BAN CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 5f11de8..4612197 100644 --- a/scripts/restore +++ b/scripts/restore @@ -42,25 +42,18 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= ynh_script_progression --message="Recreating the dedicated system user..." --weight=3 # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir=$final_path +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring app main directory..." +ynh_script_progression --message="Restoring the app main directory..." ynh_restore_file --origin_path="$final_path" @@ -69,16 +62,19 @@ chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" #================================================= -# RESTORE THE PHP-FPM CONFIGURATION +# RESTORE THE DATA DIRECTORY #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=10 +ynh_script_progression --message="Restoring data directory..." -# Restore the file first, so it can have a backup if different -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +# Use --not_mandatory for the data directory, because if the backup has been made with BACKUP_CORE_ONLY, there's no data into the backup. +ynh_restore_file --origin_path="$datapath" --not_mandatory -# Recreate a dedicated php-fpm config -ynh_add_fpm_config --package="$extra_php_dependencies" -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +# Create app folders +mkdir -p /home/yunohost.app/$app/upload + +chmod 750 "$datapath" +chmod -R o-rwx "$datapath" +chown -R $app:www-data "$datapath" #================================================= # RESTORE FAIL2BAN CONFIGURATION @@ -102,6 +98,21 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=40 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies +#================================================= +# RESTORE THE PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=10 + +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) + +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX configuration..." + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -111,21 +122,6 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql -#================================================= -# RESTORE THE DATA DIRECTORY -#================================================= -ynh_script_progression --message="Restoring data directory..." - -# Use --not_mandatory for the data directory, because if the backup has been made with BACKUP_CORE_ONLY, there's no data into the backup. -ynh_restore_file --origin_path="$datapath" --not_mandatory - -# Create app folders -mkdir -p /home/yunohost.app/$app/upload - -chmod 750 "$datapath" -chmod -R o-rwx "$datapath" -chown -R $app:www-data "$datapath" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b40cddd..73110b7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,10 +18,10 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) +language=$(ynh_app_setting_get --app=$app --key=language) admin=$(ynh_app_setting_get --app=$app --key=admin) is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name admin_pwd=$(ynh_app_setting_get --app=$app --key=admin_pwd) @@ -37,6 +37,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # FIX MISSING APP SETTING THAT BREAKS BACKUP #================================================= + # If datapath doesn't exist, create it if [ -z "$datapath" ]; then datapath=/home/yunohost.app/$app @@ -64,6 +65,11 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Ensuring downward compatibility..." +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all +fi + # If db_name doesn't exist, create it if [ -z "$db_name" ]; then db_name=$(ynh_sanitize_dbid --db_name=$app) @@ -102,18 +108,13 @@ then ynh_app_setting_delete --app=$app --key=path_url fi -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all -fi - #================================================= # CREATE DEDICATED USER #================================================= 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 +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -167,14 +168,6 @@ 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=2 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -188,9 +181,17 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=3 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # SPECIFIC UPGRADE #================================================= From 9c6cbd1d9aff00cd8de05bbae14c7e701691f48f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 24 Jun 2022 03:33:21 +0000 Subject: [PATCH 4/6] Auto-update README --- README.md | 19 ++++++++++--------- README_fr.md | 25 +++++++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 71747f3..98e4134 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # 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) +[![Integration level](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![Working status](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Maintenance status](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)* @@ -24,7 +24,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Screenshots -![](./doc/screenshots/screenshot_Piwigo.jpg) +![Screenshot of Piwigo](./doc/screenshots/screenshot_Piwigo.jpg) ## Disclaimers / important information @@ -40,21 +40,22 @@ In addition to Piwigo core features, the following are made available with this ## 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 +* 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/piwigo_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash 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 +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index cb07199..362bc02 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # 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) +[![Niveau d'intégration](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Statut de maintenance](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.* @@ -20,7 +24,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Captures d'écran -![](./doc/screenshots/screenshot_Piwigo.jpg) +![Capture d'écran de Piwigo](./doc/screenshots/screenshot_Piwigo.jpg) ## Avertissements / informations importantes @@ -36,21 +40,22 @@ In addition to Piwigo core features, the following are made available with this ## 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 +* 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/piwigo_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash 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 +**Plus d'infos sur le packaging d'applications :** From 08f42eff00d2c184c43fe234e1955ec5c58ae3f4 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 24 Jun 2022 12:51:45 +0200 Subject: [PATCH 5/6] Fix missing $email --- scripts/upgrade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 73110b7..a455268 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,6 +27,8 @@ db_user=$db_name admin_pwd=$(ynh_app_setting_get --app=$app --key=admin_pwd) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +email=$(ynh_user_get_info --username=$admin --key=mail) + #================================================= # CHECK VERSION #================================================= From 688d31b4f94ae4d0e297caa02d3e75136c87737b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 24 Jun 2022 12:52:29 +0200 Subject: [PATCH 6/6] Revert "Fix missing $email" This reverts commit 08f42eff00d2c184c43fe234e1955ec5c58ae3f4. --- scripts/upgrade | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index a455268..73110b7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,8 +27,6 @@ db_user=$db_name admin_pwd=$(ynh_app_setting_get --app=$app --key=admin_pwd) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -email=$(ynh_user_get_info --username=$admin --key=mail) - #================================================= # CHECK VERSION #=================================================