Merge branch 'testing' into testing

.github/ISSUE_TEMPLATE.md

@@ -6,11 +6,11 @@ about: When creating a bug report, please use the following template to provide
 
 **How to post a meaningful bug report**
 1. *Read this whole template first.*
-2. *Make sure you are on the right place:*
+2. *Determine if you are on the right place:*
-   - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!*
+   - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!*
    - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.*
-   - *In doubt, ask here and we will figure it out together.*
+   - *When in doubt, post here and we will figure it out together.*
-3. *Delete these italic comments as you write over them below, and remove this guide.*
+3. *Delete the italic comments as you write over them below, and remove this guide.*
 --- 
 
 ### Describe the bug
@@ -22,7 +22,7 @@ about: When creating a bug report, please use the following template to provide
 - Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...*
 - YunoHost version: x.x.x
 - I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...*
-- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes*
+- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes*
   - If yes, please explain:
 - Using, or trying to install package version/branch:
 - If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`*
@@ -31,13 +31,13 @@ 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 misskey
+    sudo yunohost app install the_app
     ```
 - *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:*
    1. *Go to '...'*
-   2. *Click on '....'*
+   2. *Click on '...'*
-   3. *Scroll down to '....'*
+   3. *Scroll down to '...'*
    4. *See error*
 
 ### Expected behavior

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+## Problem
+
+- *Description of why you made this PR*
+
+## Solution
+
+- *And how do you fix that problem*
+
+## PR Status
+
+- [ ] Code finished and ready to be reviewed/tested
+- [ ] The fix/enhancement were manually tested (if applicable)
+
+## Automatic tests
+
+Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization)

README.md

@@ -1,7 +1,3 @@
-
-
----
-
 <!--
 N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
 It shall NOT be edited by hand.
@@ -9,38 +5,54 @@ It shall NOT be edited by hand.
 
 # Misskey for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/misskey.svg)](https://dash.yunohost.org/appci/app/misskey) ![](https://ci-apps.yunohost.org/ci/badges/misskey.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/misskey.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/misskey.svg)](https://dash.yunohost.org/appci/app/misskey) ![](https://ci-apps.yunohost.org/ci/badges/misskey.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/misskey.maintain.svg)  
-[![Install misskey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=misskey)
+[![Install Misskey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=misskey)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install misskey quickly and simply on a YunoHost server.
+> *This package allows you to install Misskey 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
 
 Microblogging platform
 
-**Shipped version:** 12.82.0~ynh1
+**Shipped version:** 12.82.0~ynh2
-
 
 
 
 ## Screenshots
 
+![](./doc/screenshots/screenshot.jpg)
 
-   ![](./doc/screenshots/screenshot.jpg)
+## Disclaimers / important information
 
+### Important points to read before installing
 
+- *Misskey* require a dedicated root domain, eg. `misskey.domain.tld`
+- *Misskey* can take quite some time to install (more then 30 minutes). So take out some time and grab yourself a coffee.
+- If installing from command line use of screen is rerecorded to avoid disconnection. See below.
+- After installation, first page can take time to load and may show timeout error. Give it time to make itself ready for you. Refresh page after 2-3 minutes.
+- The first account created will be an admin user and will have all the admin rights.
 
+Using screen in case of disconnects
 
+``` 
+sudo apt-get install screen
+screen
+sudo yunohost app install https://github.com/YunoHost-Apps/misskey_ynh.git
+```
+Recover after disconnect:
+```
+screen -d
+screen -r
+```
 
 ## Documentation and resources
 
 * Official app website: https://join.misskey.page
 * Official user documentation: https://yunohost.org/apps
-
+* Upstream app code repository: https://github.com/misskey-dev/misskey
-* Upstream app code repository:  https://github.com/misskey-dev/misskey
 * YunoHost documentation for this app: https://yunohost.org/app_misskey
 * Report a bug: https://github.com/YunoHost-Apps/misskey_ynh/issues
 

README_fr.md

@@ -1,40 +1,56 @@
 # Misskey pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/misskey.svg)](https://dash.yunohost.org/appci/app/misskey) ![](https://ci-apps.yunohost.org/ci/badges/misskey.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/misskey.maintain.svg)
+[![Niveau d'intégration](https://dash.yunohost.org/integration/misskey.svg)](https://dash.yunohost.org/appci/app/misskey) ![](https://ci-apps.yunohost.org/ci/badges/misskey.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/misskey.maintain.svg)  
-[![Installer misskey avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=misskey)
+[![Installer Misskey avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=misskey)
 
 *[Read this readme in english.](./README.md)*
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install misskey quickly and simply on a YunoHost server.
+> *Ce package vous permet d'installer Misskey rapidement et simplement sur un serveur YunoHost.
-If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
 
 ## Vue d'ensemble
 
 Platforme de Microblogging
 
-**Version incluse:** 12.81.0~ynh1
+**Version incluse :** 12.82.0~ynh2
-
 
 
 
 ## Captures d'écran
 
+![](./doc/screenshots/screenshot.jpg)
 
-   ![](./doc/screenshots/screenshot.jpg)
+## Avertissements / informations importantes
 
+### Points importants à lire avant l'installation
 
+- *Misskey* nécessite un domaine racine dédié, par ex. `misskey.domain.tld`
+- *Misskey* peut prendre un certain temps à installer (plus de 30 minutes). Alors prenez un peu de temps et prenez un café.
+- Si l'installation à partir de la ligne de commande, l'utilisation de l'écran est réenregistrée pour éviter la déconnexion. Voir ci-dessous.
+- Après l'installation, la première page peut prendre du temps à charger et peut afficher une erreur de délai d'attente. Donnez-lui le temps de se préparer pour vous. Actualiser la page après 2-3 minutes.
+- Le premier compte créé sera un utilisateur administrateur et disposera de tous les droits d'administrateur.
 
+Utiliser *screen* en cas de déconnexion
 
+``` 
+sudo apt-get install screen
+screen
+sudo yunohost app install https://github.com/YunoHost-Apps/misskey_ynh.git
+```
+Récupérer après déconnexion :
+```
+screen -d
+screen -r
+```
 
 ## Documentations et ressources
 
-* Site official de l'app : https://join.misskey.page
+* Site officiel de l'app : https://join.misskey.page
-* Documentation officielle utilisateur: https://yunohost.org/apps
+* Documentation officielle utilisateur : https://yunohost.org/apps
-
+* Dépôt de code officiel de l'app : https://github.com/misskey-dev/misskey
-* Dépôt de code officiel de l'app:  https://github.com/syuilo/misskey
+* Documentation YunoHost pour cette app : https://yunohost.org/app_misskey
-* Documentation YunoHost pour cette app: https://yunohost.org/app_misskey
+* Signaler un bug : https://github.com/YunoHost-Apps/misskey_ynh/issues
-* Signaler un bug: https://github.com/YunoHost-Apps/misskey_ynh/issues
 
 ## Informations pour les développeurs
 
@@ -43,8 +59,8 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno
 Pour essayer la branche testing, procédez comme suit.
 ```
 sudo yunohost app install https://github.com/YunoHost-Apps/misskey_ynh/tree/testing --debug
-or
+ou
 sudo yunohost app upgrade misskey -u https://github.com/YunoHost-Apps/misskey_ynh/tree/testing --debug
 ```
 
-**Plus d'infos sur le packaging d'applications:** https://yunohost.org/packaging_apps
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps

doc/DISCLAIMER.md

@@ -0,0 +1,20 @@
+### Important points to read before installing
+
+- *Misskey* require a dedicated root domain, eg. `misskey.domain.tld`
+- *Misskey* can take quite some time to install (more then 30 minutes). So take out some time and grab yourself a coffee.
+- If installing from command line use of screen is rerecorded to avoid disconnection. See below.
+- After installation, first page can take time to load and may show timeout error. Give it time to make itself ready for you. Refresh page after 2-3 minutes.
+- The first account created will be an admin user and will have all the admin rights.
+
+Using screen in case of disconnects
+
+``` 
+sudo apt-get install screen
+screen
+sudo yunohost app install https://github.com/YunoHost-Apps/misskey_ynh.git
+```
+Recover after disconnect:
+```
+screen -d
+screen -r
+```

doc/DISCLAIMER_fr.md

@@ -0,0 +1,20 @@
+### Points importants à lire avant l'installation
+
+- *Misskey* nécessite un domaine racine dédié, par ex. `misskey.domain.tld`
+- *Misskey* peut prendre un certain temps à installer (plus de 30 minutes). Alors prenez un peu de temps et prenez un café.
+- Si l'installation à partir de la ligne de commande, l'utilisation de l'écran est réenregistrée pour éviter la déconnexion. Voir ci-dessous.
+- Après l'installation, la première page peut prendre du temps à charger et peut afficher une erreur de délai d'attente. Donnez-lui le temps de se préparer pour vous. Actualiser la page après 2-3 minutes.
+- Le premier compte créé sera un utilisateur administrateur et disposera de tous les droits d'administrateur.
+
+Utiliser *screen* en cas de déconnexion
+
+``` 
+sudo apt-get install screen
+screen
+sudo yunohost app install https://github.com/YunoHost-Apps/misskey_ynh.git
+```
+Récupérer après déconnexion :
+```
+screen -d
+screen -r
+```

manifest.json

@@ -6,7 +6,7 @@
     "en": "Microblogging platform",
     "fr": "Platforme de Microblogging"
   },
-  "version": "12.82.0~ynh1",
+  "version": "12.82.0~ynh2",
   "url": "https://join.misskey.page/en/",
   "upstream": {
         "license": "AGPL-3.0",

pull_request_template.md

@@ -1,16 +0,0 @@
-## Problem
-- *Description of why you made this PR*
-
-## Solution
-- *And how do you fix that problem*
-
-## PR Status
-- [ ] Code finished.
-- [ ] Tested with Package_check.
-- [ ] Fix or enhancement tested.
-- [ ] Upgrade from last version tested.
-- [ ] Can be reviewed and tested.
-
-## Package_check results
----
-* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*

scripts/_common.sh

@@ -7,7 +7,7 @@
 MEMORY_NEEDED="2560"
 
 # dependencies used by the app
-pkg_dependencies="build-essential python ffmpeg redis-server redis-tools postgresql postgresql-contrib"
+pkg_dependencies="build-essential ffmpeg redis-server redis-tools postgresql postgresql-contrib"
 
 NODEJS_VERSION="12"
 

scripts/remove

@@ -84,14 +84,14 @@ ynh_remove_nginx_config
 #=================================================
 
 # Remove the log files
-ynh_secure_remove --file="/var/log/$app/"
+ynh_secure_remove --file="/var/log/$app"
 
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
 # REMOVE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Removing the dedicated system user..."  --weight=1
+ynh_script_progression --message="Removing the dedicated system user..." --weight=1
 
 # Delete a system user
 ynh_system_user_delete --username=$app