From 52d6da1029c24c5a4071cfaa0510df1dc35bc0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Jul 2023 11:06:46 +0200 Subject: [PATCH] Testing (#23) * Auto-update README * 1.5.1 * Auto-update README * Php (#18) * Update _common.sh * Auto-update README * add config panel * fix * Update config_panel.toml Co-authored-by: yunohost-bot * Upgrade auto-updater (#20) * [autopatch] Upgrade auto-updater * Auto-update README --------- Co-authored-by: tituspijean * Version 2 (#21) * v2 * v2 * Auto-update README * Update upgrade --------- Co-authored-by: yunohost-bot * Update manifest.toml * Auto-update README * cleaning * Auto-update README * cleaning * Delete ADMIN.md * Auto-update README * Update DESCRIPTION_fr.md * Auto-update README --------- Co-authored-by: yunohost-bot Co-authored-by: YunoHost Bot Co-authored-by: tituspijean --- README.md | 9 ++------- README_fr.md | 8 ++------ doc/ADMIN.md | 7 ------- doc/DESCRIPTION.md | 6 +----- doc/DESCRIPTION_fr.md | 6 +----- manifest.toml | 13 ++++++------- scripts/install | 5 ----- scripts/remove | 5 ----- scripts/restore | 5 ----- scripts/upgrade | 7 +------ 10 files changed, 13 insertions(+), 58 deletions(-) delete mode 100755 doc/ADMIN.md diff --git a/README.md b/README.md index 53335ff..01903cd 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Minimalist pastebin where the server has zero knowledge of pasted data +Minimalist pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256bit AES in Galois Counter mode. -Data is encrypted/decrypted in the browser using 256bit AES in Galois Counter mode. - -This is a fork of ZeroBin, originally developed by Sébastien Sauvage. It was refactored to allow easier and cleaner extensions and has now much more features than the original. It is however still fully compatible to the original ZeroBin 0.19 data storage scheme. Therefore such installations can be upgraded to this fork without loosing any data. - - -**Shipped version:** 1.5.1~ynh2 +**Shipped version:** 1.5.2~ynh1 **Demo:** https://privatebin.net/ diff --git a/README_fr.md b/README_fr.md index a5f5eb8..6e4233e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,14 +16,10 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Pastebin minimaliste où le serveur n'a aucune connaissance des données copiées - -Les données sont chiffrées et déchiffrées dans le navigateur en utilisant la technologie AES 256bits en mode Galois Counter (GCM). - -Ce projet est un fork de ZeroBin, développé à l'origine par Sébastien Sauvage. Il a été ré-écrit pour accepter plus facilement des extensions en rajoutant plus de fonctionnalités. Il reste cependant compatible avec le schéma original de stockage des données Zerobin 0.19. Ainsi toutes les installations peuvent être mises à jour vers ce projet, sans perte de données. +Pastebin minimaliste où le serveur n'a aucune connaissance des données copiées. Les données sont chiffrées et déchiffrées dans le navigateur en utilisant la technologie AES 256bits en mode Galois Counter (GCM). -**Version incluse :** 1.5.1~ynh2 +**Version incluse :** 1.5.2~ynh1 **Démo :** https://privatebin.net/ diff --git a/doc/ADMIN.md b/doc/ADMIN.md deleted file mode 100755 index 239536a..0000000 --- a/doc/ADMIN.md +++ /dev/null @@ -1,7 +0,0 @@ -## Additional information - -In the [update documentation](https://github.com/PrivateBin/PrivateBin/wiki/Configuration#zerobincompatibility) of PrivateBin, it is specified that: - -For full compatibility with ZeroBin and to be able to decrypt old pastes, you would enable this option. However this is not recommend for new installations as it weakens the security of your PrivateBin instance. - -This means that we have decided to delete the directory that allows us to save the data. You can save the 'data' directory, if you want to keep your data. But you should know that this weakens the security of this application. diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 4d0a7a2..3e9fc48 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,5 +1 @@ -Minimalist pastebin where the server has zero knowledge of pasted data - -Data is encrypted/decrypted in the browser using 256bit AES in Galois Counter mode. - -This is a fork of ZeroBin, originally developed by Sébastien Sauvage. It was refactored to allow easier and cleaner extensions and has now much more features than the original. It is however still fully compatible to the original ZeroBin 0.19 data storage scheme. Therefore such installations can be upgraded to this fork without loosing any data. +Minimalist pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256bit AES in Galois Counter mode. \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index b7cbe6b..b917b9c 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1,5 +1 @@ -Pastebin minimaliste où le serveur n'a aucune connaissance des données copiées - -Les données sont chiffrées et déchiffrées dans le navigateur en utilisant la technologie AES 256bits en mode Galois Counter (GCM). - -Ce projet est un fork de ZeroBin, développé à l'origine par Sébastien Sauvage. Il a été ré-écrit pour accepter plus facilement des extensions en rajoutant plus de fonctionnalités. Il reste cependant compatible avec le schéma original de stockage des données Zerobin 0.19. Ainsi toutes les installations peuvent être mises à jour vers ce projet, sans perte de données. +Pastebin minimaliste où le serveur n'a aucune connaissance des données copiées. Les données sont chiffrées et déchiffrées dans le navigateur en utilisant la technologie AES 256bits en mode Galois Counter (GCM). diff --git a/manifest.toml b/manifest.toml index b103b63..7f966f8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "PrivateBin" description.en = "Minimalist pastebin where the server has zero knowledge of pasted data" description.fr = "Pastebin minimaliste où le serveur n'a aucune connaissance des données copiées" -version = "1.5.1~ynh2" +version = "1.5.2~ynh1" maintainers = [""] @@ -17,13 +17,13 @@ admindoc = "https://github.com/PrivateBin/PrivateBin/wiki" code = "https://github.com/PrivateBin/PrivateBin" [integration] -yunohost = ">= 11.1.17" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true ldap = false sso = false disk = "50M" -ram.build = "50M" +ram.build = "150M" ram.runtime = "50M" [install] @@ -42,9 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/PrivateBin/PrivateBin/archive/1.5.1.tar.gz" - sha256 = "d3c3d4b85afa6c429fd912ef8c8f46ee1e06b2b592afdd8a28890722d57c5bd8" - + url = "https://github.com/PrivateBin/PrivateBin/archive/1.5.2.tar.gz" + sha256 = "29647a51d711e4929c47bff517a22433c4994c888220c43609b33e7755832dde" [resources.system_user] @@ -54,5 +53,5 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.0-fpm" + packages = "php8.2-fpm" \ No newline at end of file diff --git a/scripts/install b/scripts/install index 7c3d870..9d60d01 100644 --- a/scripts/install +++ b/scripts/install @@ -45,11 +45,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index 8a87488..0b31650 100644 --- a/scripts/remove +++ b/scripts/remove @@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index 88ab200..77f8af0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,11 +27,6 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# 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" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 923c3da..b634c7e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -61,12 +61,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=3 # 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 +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config