From 332671a55887c61aa6ef3c71b510b7ef769218ee Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 16 Jun 2021 12:31:52 +0200 Subject: [PATCH 1/3] 4.7.0 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 4125ab5..d60aa4a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.6.0.tar.gz -SOURCE_SUM=d723fec493b1254946015ce7d40b8cc3ca528d558bf434fd26742fbc5b5a1f12 +SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.7.0.tar.gz +SOURCE_SUM=33f7a352b034ef12ee9e588896c11b7bc18a3ed216c864798d1d17da5debc982 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=cryptpad-4.6.0.tar.gz +SOURCE_FILENAME=cryptpad-4.7.0.tar.gz diff --git a/manifest.json b/manifest.json index 87fb41c..92286db 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Zero Knowledge realtime collaborative editor", "fr": "Éditeur chiffré collaboratif en temps réel." }, - "version": "4.6.0~ynh1", + "version": "4.7.0~ynh1", "url": "https://cryptpad.fr/", "upstream": { "license": "AGPL-3.0-only", From b5a55ab82f8db4c934fa5b023eb98468d156a193 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 16 Jun 2021 10:32:01 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 126 ++++++++++++++++++++++----------------------------- README_fr.md | 64 +++++++++----------------- 2 files changed, 75 insertions(+), 115 deletions(-) diff --git a/README.md b/README.md index 824b8cc..1030d9e 100644 --- a/README.md +++ b/README.md @@ -1,72 +1,54 @@ -# CryptPad for YunoHost - -[![Integration level](https://dash.yunohost.org/integration/cryptpad.svg)](https://dash.yunohost.org/appci/app/cryptpad) ![](https://ci-apps.yunohost.org/ci/badges/cryptpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cryptpad.maintain.svg) -[![Install CryptPad with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cryptpad) - -*[Lire ce readme en français.](./README_fr.md)* - -> *This package allows you to install CryptPad 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 -CryptPad is a collaborative encrypted document editor in real time. It is a privacy-friendly alternative to popular office tools and cloud services. All content stored in CryptPad is encrypted before being sent, which means that no one can access your data unless you give them the keys. You can share access to a document simply by sharing the link. - -**Shipped version:** 4.6.0 - -## Screenshots - -![](https://github.com/xwiki-labs/cryptpad/raw/main/screenshot.png) - -## Demo - -* [Official demo](https://cryptpad.fr/) - -## Configuration - -* How to configure this app: From the admin panel and the plain file `/var/www/cryptpad/config/config.js.` - -## Documentation - -* Official documentation: https://docs.cryptpad.fr/en/ -* YunoHost documentation: If specific documentation is needed, feel free to contribute. - -## YunoHost specific features - -#### Multi-user support - -* Are LDAP and HTTP auth supported? **No** -* Can the app be used by multiple users? **Yes** - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/cryptpad.svg)](https://ci-apps.yunohost.org/ci/apps/cryptpad/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/cryptpad.svg)](https://ci-apps-arm.yunohost.org/ci/apps/cryptpad/) - -## Limitations - -* Installation possible only on a root domain (CryptPad limitation) -* Can't login via SSO (due to this [CryptPad limitation](https://github.com/xwiki-labs/cryptpad/issues/116)) - -## Additional information - -* To increase space for CryptPad users, you can modify `/var/www/cryptpad/config/config.js`, and restart the CryptPad service with `sudo service cryptpad restart`. - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/cryptpad_ynh/issues - * App website: https://cryptpad.fr/ - * Upstream app repository: https://github.com/xwiki-labs/cryptpad - * YunoHost website: https://yunohost.org/ - ---- - -## Developer info - -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/cryptpad_ynh/tree/testing). - -To try the testing branch, please proceed like that. -``` -sudo yunohost app install https://github.com/YunoHost-Apps/cryptpad_ynh/tree/testing --debug -or -sudo yunohost app upgrade cryptpad -u https://github.com/YunoHost-Apps/cryptpad_ynh/tree/testing --debug -``` + + +# CryptPad for YunoHost + +[![Integration level](https://dash.yunohost.org/integration/cryptpad.svg)](https://dash.yunohost.org/appci/app/cryptpad) ![](https://ci-apps.yunohost.org/ci/badges/cryptpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cryptpad.maintain.svg) +[![Install CryptPad with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cryptpad) + +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install CryptPad 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 + +Zero Knowledge realtime collaborative editor + +**Shipped version:** 4.7.0~ynh1 + +**Demo:** https://cryptpad.fr/ + +## Screenshots + +![](./doc/screenshots/screenshot.png) + +## Disclaimers / important information + +## Configuration + +* How to configure this app: From the admin panel and the plain file `/var/www/cryptpad/config/config.js.` + +## Documentation and resources + +* Official app website: https://cryptpad.fr/ +* Official user documentation: https://yunohost.org/apps +* Official admin documentation: https://docs.cryptpad.fr/en/ +* Upstream app code repository: https://github.com/xwiki-labs/cryptpad +* YunoHost documentation for this app: https://yunohost.org/app_cryptpad +* Report a bug: https://github.com/YunoHost-Apps/cryptpad_ynh/issues + +## Developer info + +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/cryptpad_ynh/tree/testing). + +To try the testing branch, please proceed like that. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/cryptpad_ynh/tree/testing --debug +or +sudo yunohost app upgrade cryptpad -u https://github.com/YunoHost-Apps/cryptpad_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 4f38a55..93a14e7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,64 +1,40 @@ # CryptPad pour YunoHost -[![Integration level](https://dash.yunohost.org/integration/cryptpad.svg)](https://dash.yunohost.org/appci/app/cryptpad) ![](https://ci-apps.yunohost.org/ci/badges/cryptpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cryptpad.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/cryptpad.svg)](https://dash.yunohost.org/appci/app/cryptpad) ![](https://ci-apps.yunohost.org/ci/badges/cryptpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cryptpad.maintain.svg) [![Installer CryptPad avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cryptpad) -*[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 CryptPad rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/install) pour apprendre comment l'installer.* +> *Ce package vous permet d'installer CryptPad 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 -CryptPad est un éditeur de documents chiffrés collaboratifs en temps réel. C'est une alternative respectant la vie privée aux outils office et aux services cloud populaires. Tout le contenu stocké dans CryptPad est chiffré avant d'être envoyé, ce qui signifie que personne ne peut accéder à vos données à moins que vous ne leur donniez les clés. Vous pouvez partager l'accès à un document simplement en partageant le lien. -**Version incluse :** 4.6.0 +Éditeur chiffré collaboratif en temps réel. + +**Version incluse :** 4.7.0~ynh1 + +**Démo :** https://cryptpad.fr/ ## Captures d'écran -![](https://github.com/xwiki-labs/cryptpad/raw/main/screenshot.png) +![](./doc/screenshots/screenshot.png) -## Démo - -* [Démo officielle](https://cryptpad.fr/) +## Avertissements / informations importantes ## Configuration Comment configurer cette application : via le panneau d'administration ainsi que le fichier de configuration `/var/www/cryptpad/config/config.js`. -## Documentation +## Documentations et ressources -* Official documentation : https://docs.cryptpad.fr/fr/ -* YunoHost documentation : If specific documentation is needed, feel free to contribute. - -## Caractéristiques spécifiques YunoHost - -#### Support multi-utilisateur - -* L'authentification LDAP et HTTP est-elle prise en charge ? **Non** -* L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** - -#### Architectures supportées - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/cryptpad.svg)](https://ci-apps.yunohost.org/ci/apps/cryptpad/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/cryptpad.svg)](https://ci-apps-arm.yunohost.org/ci/apps/cryptpad/) - -## Limitations - -* Nécessite un sous-domaine / domaine dédié. (limitation de CryptPad) -* Impossible de se connecter via SSO (cf [limitation de CryptPad](https://github.com/xwiki-labs/cryptpad/issues/116)) - -## Informations additionnelles - -* Pour augmenter l'espace pour l'utilisateur dans le CryptPad, vous pouvez configurer le fichier `config.js` dans le dossier `/var/www/cryptpad/config/config.js`, puis redémarrez le service CryptPad `sudo service cryptpad restart`. - -## Liens - -* Signaler un bug : https://github.com/YunoHost-Apps/cryptpad_ynh/issues -* Site de l'application : https://cryptpad.fr/ -* Dépôt de l'application principale : https://github.com/xwiki-labs/cryptpad -* Site web YunoHost : https://yunohost.org/ - ---- +* Site officiel de l'app : https://cryptpad.fr/ +* Documentation officielle utilisateur : https://yunohost.org/apps +* Documentation officielle de l'admin : https://docs.cryptpad.fr/en/ +* Dépôt de code officiel de l'app : https://github.com/xwiki-labs/cryptpad +* Documentation YunoHost pour cette app : https://yunohost.org/app_cryptpad +* Signaler un bug : https://github.com/YunoHost-Apps/cryptpad_ynh/issues ## Informations pour les développeurs @@ -70,3 +46,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/cryptpad_ynh/tree/tes ou sudo yunohost app upgrade cryptpad -u https://github.com/YunoHost-Apps/cryptpad_ynh/tree/testing --debug ``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file From f1304c40fc9fcf9ad6d8965b63d4062deb03dae0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 16 Jun 2021 13:53:16 +0200 Subject: [PATCH 3/3] Update check_process --- check_process | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/check_process b/check_process index 24edff6..aa6ec58 100644 --- a/check_process +++ b/check_process @@ -12,12 +12,10 @@ setup_private=1 setup_public=1 upgrade=1 - #4.1.0 - upgrade=1 from_commit=b0dd9be98e3cfedec24d3910058682b36e3fedda - #4.2.1 - upgrade=1 from_commit=e0fbc906d1445311541dd1b8b7005735b0435537 #4.3.1 upgrade=1 from_commit=03c56e25d8e5ce4312bd0b9bd6bd37469f396a22 + #4.6.0 + upgrade=1 from_commit=198d9d2bbdb131354f4d8ba3179021de9e58a75a backup_restore=1 multi_instance=0 change_url=1 @@ -25,11 +23,9 @@ Email= Notification=none ;;; Upgrade options - ; commit=b0dd9be98e3cfedec24d3910058682b36e3fedda - name=update to 4.1.0 - ; commit=63f434a721fdea008ff5171b18131afa8d47c140 - name=update to 4.2.1 ; commit=e0fbc906d1445311541dd1b8b7005735b0435537 name=update to 4.3.1 + ; commit=198d9d2bbdb131354f4d8ba3179021de9e58a75a + name=update to 4.6.0 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& \ No newline at end of file