diff --git a/README.md b/README.md index e168127..425124e 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ # Encryptic for YunoHost -[![Integration level](https://dash.yunohost.org/integration/laverna.svg)](https://dash.yunohost.org/appci/app/laverna) ![](https://ci-apps.yunohost.org/ci/badges/laverna.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/laverna.maintain.svg) -[![Install Laverna with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=laverna) +[![Integration level](https://dash.yunohost.org/integration/encryptic.svg)](https://dash.yunohost.org/appci/app/encryptic) ![](https://ci-apps.yunohost.org/ci/badges/encryptic.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/encryptic.maintain.svg) +[![Install Encryptic with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=encryptic) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Laverna rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer Encryptic 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.* ## Overview Encryptic is an anonymous system, encrypted and without registration required, it is accessible via a web browser (without software installation). The data is private because it is stored by default on your machine (InnoDB and localstorage), it is a setting in the settings that will allow you to synchronize it via the cloud on your various devices. -**Shipped version:** 0.7.51 +**Shipped version:** 0.1.0 ## Screenshots @@ -40,8 +40,8 @@ How to configure this app: From an admin panel, a plain file with SSH, or any ot #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/laverna%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/laverna/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/laverna%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/laverna/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/encryptic%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/encryptic/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/encryptic%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/encryptic/) ## Limitations @@ -53,20 +53,20 @@ How to configure this app: From an admin panel, a plain file with SSH, or any ot ## Links - * Report a bug: https://github.com/YunoHost-Apps/laverna_ynh/issues + * Report a bug: https://github.com/YunoHost-Apps/encryptic_ynh/issues * App website: https://encryptic.org/ - * Upstream app repository: https://github.com/Laverna/laverna + * Upstream app repository: https://github.com/encryptic-team/encryptic * YunoHost website: https://yunohost.org/ --- ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/laverna_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/encryptic_ynh/tree/testing). To try the testing branch, please proceed like that. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/laverna_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/encryptic_ynh/tree/testing --debug or -sudo yunohost app upgrade laverna -u https://github.com/YunoHost-Apps/laverna_ynh/tree/testing --debug +sudo yunohost app upgrade encryptic -u https://github.com/YunoHost-Apps/encryptic_ynh/tree/testing --debug ``` diff --git a/README_fr.md b/README_fr.md index 8dd11fa..0cb51e3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,18 +1,18 @@ # Laverna pour YunoHost -[![Integration level](https://dash.yunohost.org/integration/laverna.svg)](https://dash.yunohost.org/appci/app/laverna) ![](https://ci-apps.yunohost.org/ci/badges/laverna.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/laverna.maintain.svg) -[![Installer Laverna avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=laverna) +[![Integration level](https://dash.yunohost.org/integration/encryptic.svg)](https://dash.yunohost.org/appci/app/encryptic) ![](https://ci-apps.yunohost.org/ci/badges/encryptic.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/encryptic.maintain.svg) +[![Installer Encryptic avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=encryptic) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install Laverna quickly and simply on a YunoHost server. +> *This package allows you to install Encryptic 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.* ## Vue d'ensemble Encryptic est un système anonyme, crypté et sans inscription requise, il est accessible via un navigateur web (sans installation de logiciel). Les données sont privées, car stockées par défaut sur votre machine (InnoDB et localstorage), c’est un réglage dans les paramètres qui vous permettra de les synchroniser via le cloud sur vos différents périphériques. -**Version incluse :** 0.7.51 +**Version incluse :** 0.1.0 ## Captures d'écran @@ -40,8 +40,8 @@ Comment configurer cette application : via le panneau d'administration, un fichi #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/laverna%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/laverna/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/laverna%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/laverna/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/encryptic%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/encryptic/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/encryptic%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/encryptic/) ## Limitations @@ -53,20 +53,20 @@ Comment configurer cette application : via le panneau d'administration, un fichi ## Liens - * Signaler un bug : https://github.com/YunoHost-Apps/laverna_ynh/issues - * Site de l'application : https://laverna.cc/index.html - * Dépôt de l'application principale : https://github.com/Laverna/laverna + * Signaler un bug : https://github.com/YunoHost-Apps/encryptic_ynh/issues + * Site de l'application : https://encryptic.org/ + * Dépôt de l'application principale : https://github.com/encryptic-team/encryptic * Site web YunoHost : https://yunohost.org/ --- ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/laverna_ynh/tree/testing). +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/encryptic_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/laverna_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/encryptic_ynh/tree/testing --debug or -sudo yunohost app upgrade laverna -u https://github.com/YunoHost-Apps/laverna_ynh/tree/testing --debug +sudo yunohost app upgrade encryptic -u https://github.com/YunoHost-Apps/encryptic_ynh/tree/testing --debug ``` diff --git a/check_process b/check_process index eb06de8..23c0f52 100644 --- a/check_process +++ b/check_process @@ -30,5 +30,5 @@ Notification=none ;;; Upgrade options ; commit=CommitHash name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1& diff --git a/issue_template.md b/issue_template.md index f539f32..1cea0eb 100644 --- a/issue_template.md +++ b/issue_template.md @@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install laverna + sudo yunohost app install encryptic ``` - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* diff --git a/manifest.json b/manifest.json index 87e80d3..e60215c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,13 +1,13 @@ { - "name": "Laverna", - "id": "laverna", + "name": "Encryptic", + "id": "encryptic", "packaging_format": 1, "description": { - "en": "Taking note application with Markdown editor and encryption support.", - "fr": "Application de Prise de note avec éditeur Markdown et chiffrement." + "en": "open-source note-taking application heavily focused on encryption.", + "fr": "Application de prise de notes open source axée sur le cryptage." }, - "version": "0.7.51~ynh1", - "url": "https://laverna.cc/index.html", + "version": "0.1.0~ynh1", + "url": "https://www.encryptic.org/", "license": "MPL-2.0", "maintainer": { "name": "", @@ -26,8 +26,8 @@ "name": "domain", "type": "domain", "ask": { - "en": "Choose a domain name for Laverna", - "fr": "Choisissez un nom de domaine pour Laverna" + "en": "Choose a domain name for Encryptic", + "fr": "Choisissez un nom de domaine pour Encryptic" }, "example": "example.com" }, @@ -35,20 +35,11 @@ "name": "path", "type": "path", "ask": { - "en": "Choose a path for Laverna", - "fr": "Choisissez un chemin pour Laverna" + "en": "Choose a path for Encryptic", + "fr": "Choisissez un chemin pour Encryptic" }, - "example": "/laverna", - "default": "/laverna" - }, - { - "name": "admin", - "type": "user", - "ask": { - "en": "Choose an admin user", - "fr": "Choisissez l’administrateur" - }, - "example": "johndoe" + "example": "/encryptic", + "default": "/encryptic" }, { "name": "is_public", diff --git a/pull_request_template.md b/pull_request_template.md index b06349c..901208a 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -15,4 +15,4 @@ --- *If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/joblaverna_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/laverna_ynh%20PR-NUM-%20(USERNAME)/) +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/encryptic_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/encryptic_ynh%20PR-NUM-%20(USERNAME)/) diff --git a/scripts/backup b/scripts/backup index 532eb2a..e76deb1 100755 --- a/scripts/backup +++ b/scripts/backup @@ -18,7 +18,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_print_info --message="Backing up Laverna..." +ynh_print_info --message="Backing up Encryptic..." app=$YNH_APP_INSTANCE_NAME @@ -41,4 +41,4 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for Laverna. (YunoHost will then actually copy those files to the archive)." +ynh_print_info --message="Backup script completed for Encryptic. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index bab3080..cc9b2b9 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -34,7 +34,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up Laverna before changing its URL..." --weight=2 +ynh_script_progression --message="Backing up Encryptic before changing its URL..." --weight=2 # Backup the current version of the app ynh_backup_before_upgrade @@ -104,4 +104,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for Laverna" --last +ynh_script_progression --message="Change of URL completed for Encryptic" --last diff --git a/scripts/install b/scripts/install index 040e8f4..2a34a4a 100755 --- a/scripts/install +++ b/scripts/install @@ -12,10 +12,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - true -} -# Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= @@ -97,4 +93,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of Laverna completed" --last +ynh_script_progression --message="Installation of Encryptic completed" --last diff --git a/scripts/remove b/scripts/remove index 28ad183..a7fdfb6 100755 --- a/scripts/remove +++ b/scripts/remove @@ -23,7 +23,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing $app main directory..." --weight=3 +ynh_script_progression --message="Removing Encryptic main directory..." --weight=3 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -40,4 +40,4 @@ ynh_remove_nginx_config # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of Laverna completed" --last +ynh_script_progression --message="Removal of Encryptic completed" --last diff --git a/scripts/restore b/scripts/restore index 3f60c97..cc6ffb1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -47,7 +47,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring $app main directory..." --weight=2 +ynh_script_progression --message="Restoring Encryptic main directory..." --weight=2 ynh_restore_file --origin_path="$final_path" @@ -79,4 +79,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for Laverna" --last +ynh_script_progression --message="Restoration completed for Encryptic" --last diff --git a/scripts/upgrade b/scripts/upgrade index b95b4b7..6f9529b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,7 +49,7 @@ fi #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." --weight=3 +ynh_script_progression --message="Backing up Encryptic before upgrading (may take a while)..." --weight=3 # Backup the current version of the app ynh_backup_before_upgrade @@ -104,4 +104,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade ofLaverna completed" --last +ynh_script_progression --message="Upgrade of Encryptic completed" --last