From 2b1e521e0c39ac50f6e4271f7fa2b1ca20f7bc9a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 5 Nov 2021 23:36:21 +0100 Subject: [PATCH] 12.0.0 --- conf/app.src | 5 ++--- conf/ldap_plugin.src | 1 - doc/DESCRIPTION.md | 1 + doc/DISCLAIMER.md | 9 +++++++++ {sources => doc/screenshots}/screenshot_Piwigo.jpg | Bin scripts/install | 2 ++ scripts/remove | 12 ++++++++++++ 7 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/DISCLAIMER.md rename {sources => doc/screenshots}/screenshot_Piwigo.jpg (100%) 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/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/scripts/install b/scripts/install index 3ab6de3..85c69de 100644 --- a/scripts/install +++ b/scripts/install @@ -101,6 +101,8 @@ mkdir $final_path cp -a $tmpdir/!(upload|_data|galleries) $final_path datapath=/home/yunohost.app/$app +ynh_app_setting_set --app=$app --key=datapath --value=$datapath + 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 #=================================================