From 6b988e701b7b9439eaf6808c2c4fb12eb48b2ecb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 10 Sep 2021 21:15:45 +0200 Subject: [PATCH 1/5] Update restore --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 79f359b..2245ffd 100644 --- a/scripts/restore +++ b/scripts/restore @@ -34,8 +34,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -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 47aa4ca43ac8c2721e88d4ff64d214afd3d18fc3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 22 Sep 2021 18:27:34 +0200 Subject: [PATCH 2/5] Update manifest.json --- manifest.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 06a3b99..a948467 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "julien.malik@paraiso.me" }, "requirements": { - "yunohost": ">= 4.1.0" + "yunohost": ">= 4.2.4" }, "multi_instance": true, "services": [ @@ -25,8 +25,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", From 35f81612e1eb6eafb54f9f98627432aa0126639d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 22 Sep 2021 18:35:41 +0200 Subject: [PATCH 3/5] 1.3.5 --- conf/app.src | 5 ++--- doc/DESCRIPTION.md | 5 +++++ doc/DESCRIPTION_fr.md | 6 ++++++ doc/DISCLAIMER.md | 7 +++++++ doc/DISCLAIMER_fr.md | 5 +++++ doc/screenshots/screenshot.png | Bin 0 -> 39027 bytes manifest.json | 11 +++++++++-- 7 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/DESCRIPTION_fr.md create mode 100644 doc/DISCLAIMER.md create mode 100644 doc/DISCLAIMER_fr.md create mode 100644 doc/screenshots/screenshot.png diff --git a/conf/app.src b/conf/app.src index d7455bc..6568041 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,6 @@ -SOURCE_URL=https://github.com/PrivateBin/PrivateBin/archive/1.3.4.tar.gz -SOURCE_SUM=0dad8976d823a01de8affb4136bd205f2e5ae418c01e560a0d84f94da7a78749 +SOURCE_URL=https://github.com/PrivateBin/PrivateBin/archive/1.3.5.tar.gz +SOURCE_SUM=cbee0a8c5ef58ae98cd77982619190356f657e8bbc9e3f429307c65a411bfb80 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..5ddbde9 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1,5 @@ +PrivateBin is a minimalist, open source online 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. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..17061a4 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,6 @@ +PrivateBin est un logiciel libre, minimaliste, qui joue le rôle de pastebin (coller-corbeille) où le serveur n'a aucune connaissance des données qu'il stocke. + +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. diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..0d7a31d --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,7 @@ +## Additional information + +In the [update documentation](https://github.com/PrivateBin/PrivateBin/wiki/Configuration#zerobincompatibility) of Parsebin, 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/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md new file mode 100644 index 0000000..69f17f5 --- /dev/null +++ b/doc/DISCLAIMER_fr.md @@ -0,0 +1,5 @@ +## Informations additionnelles + +Dans la [documentation de mise à jour](https://github.com/PrivateBin/PrivateBin/wiki/Configuration#zerobincompatibility) de Privatebin, il est précisé que : +* Pour une compatibilité complète avec Zerobin et le déchiffrement de tous les vieux "paste", vous devriez activer cette option. Cependant, ce n'est pas recommandé pour les nouvelles installations car cela affaiblit la sécurité de votre instance PrivateBin. +* Ceci signifie que nous avons décidé de supprimer ce répertoire pour permettre la sécurisation des données. Vous pouvez sauvegarder le répertoire 'data', si vous voulez conservez vos données. Mais vous devriez savoir que cela réduit la sécurité de votre application. diff --git a/doc/screenshots/screenshot.png b/doc/screenshots/screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..15401678de736bb898537b5a2cab7b467ab35419 GIT binary patch literal 39027 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®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 Date: Wed, 22 Sep 2021 16:35:47 +0000 Subject: [PATCH 4/5] Auto-update README --- README.md | 62 +++++++++++++++++++++------------------------------- README_fr.md | 58 ++++++++++++++++++------------------------------ 2 files changed, 46 insertions(+), 74 deletions(-) diff --git a/README.md b/README.md index f9820f0..6831b75 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,17 @@ -# PrivateBin for YunoHost + + +# Zerobin for YunoHost [![Integration level](https://dash.yunohost.org/integration/zerobin.svg)](https://dash.yunohost.org/appci/app/zerobin) ![](https://ci-apps.yunohost.org/ci/badges/zerobin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/zerobin.maintain.svg) -[![Install PrivateBin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=zerobin) +[![Install Zerobin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=zerobin) *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install PrivateBin 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.* +> *This package allows you to install Zerobin 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 @@ -16,34 +21,16 @@ Data is encrypted/decrypted in the browser using 256bit AES in Galois Counter mo 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.3.4 + +**Shipped version:** 1.3.5~ynh1 + +**Demo:** https://privatebin.net/ ## Screenshots -![](https://privatebin.info/img/1.0/bootstrap.png) +![](./doc/screenshots/screenshot.png) -## Demo - -* [YunoHost demo](https://demo.yunohost.org/zerobin/) -* [Official demo](https://privatebin.net/) - -## Configuration - -## Documentation - - * Official documentation: https://github.com/PrivateBin/PrivateBin/wiki - * YunoHost documentation: https://yunohost.org/#/app_zerobin - -## YunoHost specific features - -#### Multi-users support - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/zerobin%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/zerobin/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/zerobin%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/zerobin/) - -## Limitations +## Disclaimers / important information ## Additional information @@ -53,18 +40,17 @@ For full compatibility with ZeroBin and to be able to decrypt old pastes, you wo 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. -## Links +## Documentation and resources - * Report a bug: https://github.com/YunoHost-Apps/zerobin_ynh/issues - * PrivateBin website: https://privatebin.info/ - * PrivateBin repository: https://github.com/PrivateBin/PrivateBin - * YunoHost website: https://yunohost.org/ +* Official app website: https://privatebin.info/ +* Official admin documentation: https://github.com/PrivateBin/PrivateBin/wiki +* Upstream app code repository: https://github.com/PrivateBin/PrivateBin +* YunoHost documentation for this app: https://yunohost.org/app_zerobin +* Report a bug: https://github.com/YunoHost-Apps/zerobin_ynh/issues ---- +## Developer info -## Developers info - -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/zerobin_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/zerobin_ynh/tree/testing). To try the testing branch, please proceed like that. ``` @@ -72,3 +58,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/zerobin_ynh/tree/test or sudo yunohost app upgrade zerobin -u https://github.com/YunoHost-Apps/zerobin_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 index 9c499e8..f0a403f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,11 +1,12 @@ -# PrivateBin pour YunoHost +# Zerobin pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/zerobin.svg)](https://dash.yunohost.org/appci/app/zerobin) ![](https://ci-apps.yunohost.org/ci/badges/zerobin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/zerobin.maintain.svg) -[![Installer PrivateBin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=zerobin) +[![Installer Zerobin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=zerobin) -*[Read this readme in english.](./README.md)* +*[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d'installer PrivateBin rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer Zerobin 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 @@ -17,34 +18,16 @@ Les données sont chiffrées et déchiffrées dans le navigateur en utilisant la 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. -**Version incluse:** 1.3.4 + +**Version incluse :** 1.3.5~ynh1 + +**Démo :** https://privatebin.net/ ## Captures d'écran -![](https://privatebin.info/img/1.0/bootstrap.png) +![](./doc/screenshots/screenshot.png) -## Démo - -* [Démo YunoHost](https://demo.yunohost.org/zerobin/) -* [Démo Privatebin](https://privatebin.net/) - -## Configuration - -## Documentation - - * Documentation officielle : https://github.com/PrivateBin/PrivateBin/wiki - * Documentation YunoHost : https://yunohost.org/#/app_zerobin_fr - -## Caractéristiques spécifiques YunoHost - -#### Support multi-utilisateurs - -#### Architectures supportées - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/zerobin%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/zerobin/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/zerobin%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/zerobin/) - -## Limitations +## Avertissements / informations importantes ## Informations additionnelles @@ -52,22 +35,23 @@ Dans la [documentation de mise à jour](https://github.com/PrivateBin/PrivateBin * Pour une compatibilité complète avec Zerobin et le déchiffrement de tous les vieux "paste", vous devriez activer cette option. Cependant, ce n'est pas recommandé pour les nouvelles installations car cela affaiblit la sécurité de votre instance PrivateBin. * Ceci signifie que nous avons décidé de supprimer ce répertoire pour permettre la sécurisation des données. Vous pouvez sauvegarder le répertoire 'data', si vous voulez conservez vos données. Mais vous devriez savoir que cela réduit la sécurité de votre application. -## Liens +## Documentations et ressources - * Signaler un bug : https://github.com/YunoHost-Apps/zerobin_ynh/issues - * Site de l'application PrivateBin : https://privatebin.info/ - * Dépot de l'application principale : https://github.com/PrivateBin/PrivateBin - * Site web YunoHost : https://yunohost.org/ - ---- +* Site officiel de l'app : https://privatebin.info/ +* Documentation officielle de l'admin : https://github.com/PrivateBin/PrivateBin/wiki +* Dépôt de code officiel de l'app : https://github.com/PrivateBin/PrivateBin +* Documentation YunoHost pour cette app : https://yunohost.org/app_zerobin +* Signaler un bug : https://github.com/YunoHost-Apps/zerobin_ynh/issues ## Informations pour les développeurs -Merci de faire vos pull request dans la [branche testing](https://github.com/YunoHost-Apps/zerobin_ynh/tree/testing). +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/zerobin_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. ``` sudo yunohost app install https://github.com/YunoHost-Apps/zerobin_ynh/tree/testing --debug -or +ou sudo yunohost app upgrade zerobin -u https://github.com/YunoHost-Apps/zerobin_ynh/tree/testing --debug ``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file From e64c141f4aab2b27e8e0a474c049e826b38983d0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 22 Sep 2021 18:38:41 +0200 Subject: [PATCH 5/5] Fix --- check_process | 6 +++--- scripts/install | 12 +++++------- scripts/remove | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 3 +-- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/check_process b/check_process index 7500154..5ff7082 100644 --- a/check_process +++ b/check_process @@ -1,8 +1,8 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - is_public=1 (PUBLIC|public=1|private=0) + domain="domain.tld" + path="/path" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/scripts/install b/scripts/install index cf6da66..cc7b2ad 100644 --- a/scripts/install +++ b/scripts/install @@ -29,7 +29,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_script_progression --message="Validating installation parameters..." +ynh_script_progression --message="Validating installation parameters..." --weight=1 final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" @@ -40,7 +40,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." +ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url @@ -74,7 +74,7 @@ chown -R $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." +ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config @@ -93,20 +93,18 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. ynh_permission_update --permission="main" --add="visitors" fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index d68cbab..80201d7 100644 --- a/scripts/remove +++ b/scripts/remove @@ -50,7 +50,7 @@ ynh_remove_fpm_config #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." +ynh_script_progression --message="Removing the dedicated system user..." --weight=1 # Delete a system user ynh_system_user_delete --username=$app diff --git a/scripts/restore b/scripts/restore index 2245ffd..ecd964d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,7 +20,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -68,7 +68,7 @@ chown -R $app:www-data "$final_path" #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." +ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 1667ea2..a740366 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -91,7 +90,7 @@ chown -R $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config