Merge pull request #5 from YunoHost-Apps/testing

Testing

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us debug, it would be nice to fill the template as much as you can to help us, help you and help us all.
+about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently.
 
 ---
 
@@ -8,28 +8,30 @@ about: Create a report to help us debug, it would be nice to fill the template a
 1. *Read this whole template first.*
 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!*
-   - *Otherwise, the issue may be due to HedgeDoc itself. Refer to its documentation or repository for help.*
+   - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.*
-   - *If you have a doubt, post here, we will figure it out together.*
+   - *When in doubt, post here and we will figure it out together.*
 3. *Delete the italic comments as you write over them below, and remove this guide.*
 --- 
 
-**Describe the bug**
+### Describe the bug
+
 *A clear and concise description of what the bug is.*
 
-**Versions**
+### Context
+
 - 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 kiwiirc`*
+- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`*
+
+### Steps to reproduce
 
-**To Reproduce**
-*Steps to reproduce the behavior.*
 - *If you performed a command from the CLI, the command itself is enough. For example:*
     ```sh
-    sudo yunohost app install kiwiirc
+    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:*
@@ -38,9 +40,16 @@ about: Create a report to help us debug, it would be nice to fill the template a
    3. *Scroll down to '...'*
    4. *See error*
 
-**Expected behavior**
+### Expected behavior
+
 *A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.*
 
-**Logs**
+### Logs
-*After a failed command, YunoHost makes the log available to you, but also to others, thanks to `yunohost log display [log name] --share`. The actual command, with the correct log name, is displayed at the end of the failed attempt in the CLI. Execute it and copy here the share link it outputs.*
+
+*When an operation fails, YunoHost provides a simple way to share the logs.*
+- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.*
+- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.*
+
+*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)*
+
 *If applicable and useful, add screenshots to help explain your problem.*

.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,3 +1,8 @@
+<!--
+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.
+-->
+
 # KiwiIRC for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/kiwiirc.svg)](https://dash.yunohost.org/appci/app/kiwiirc) ![](https://ci-apps.yunohost.org/ci/badges/kiwiirc.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/kiwiirc.maintain.svg)  
@@ -5,49 +10,39 @@
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install KiwiIRC quickly and simply on a YunoHost server.  
+> *This package allows you to install KiwiIRC 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
-KiwiIRC is a versatile web based messenger using IRC.
 
-**Shipped version:** 1.5.0
+A versatile web based messenger using IRC
+
+###Features:
+
+- For single networks, bouncer hosts, or a personal generic IRC client that remembers your networks
+- Works out of the box with a default IRC network - or use your own
+- Single or multiple IRC network connections
+- Light and dark modes
+- Desktop notifications
+- Extremely versatile via a single JSON config file at runtime
+
+
+**Shipped version:** 1.5.0~ynh1
+
+**Demo:** https://kiwiirc.com/nextclient
 
 ## Screenshots
 
-![](https://kiwiirc.com/img/screenshot.png)
+![](./doc/screenshots/screenshot.png)
 
-## Demo
+## Documentation and resources
 
-* [Official demo]()
+* Official app website: https://kiwiirc.com/
-
+* Official user documentation: https://yunohost.org/apps
-## Configuration
+* Official admin documentation: https://github.com/kiwiirc/kiwiirc/wiki
-
+* Upstream app code repository: https://github.com/kiwiirc/kiwiirc
-
+* YunoHost documentation for this app: https://yunohost.org/app_kiwiirc
-## Documentation
+* Report a bug: https://github.com/YunoHost-Apps/kiwiirc_ynh/issues
-
- * Official documentation: https://github.com/kiwiirc/kiwiirc/wiki
- * YunoHost documentation: 
-
-## YunoHost specific features
-
-#### Multi-user support
-
-* Is LDAP supported? **Yes**
-* Can the app be used by multiple users? **Yes**
-
-#### Supported architectures
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/kiwiirc%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/kiwiirc/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/kiwiirc%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/kiwiirc/)
-
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/kiwiirc_ynh/issues
- * Upstream app repository: https://github.com/kiwiirc/kiwiirc
- * YunoHost website: https://yunohost.org/
-
----
 
 ## Developer info
 
@@ -59,3 +54,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/kiwiirc_ynh/tree/test
 or
 sudo yunohost app upgrade kiwiirc -u https://github.com/YunoHost-Apps/kiwiirc_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps

README_fr.md

@@ -1,52 +1,44 @@
 # KiwiIRC pour YunoHost
 
 [![Niveau d'intégration](https://dash.yunohost.org/integration/kiwiirc.svg)](https://dash.yunohost.org/appci/app/kiwiirc) ![](https://ci-apps.yunohost.org/ci/badges/kiwiirc.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/kiwiirc.maintain.svg)  
-[![Installer kiwiIRC avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kiwiirc)
+[![Installer KiwiIRC avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kiwiirc)
 
-*[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 kiwiIRC rapidement et simplement sur un serveur YunoHost.  
+> *Ce package vous permet d'installer KiwiIRC 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.*
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
 
 ## Vue d'ensemble
-KiwiIRC est un messager Web polyvalent utilisant IRC.
 
-**Version incluse :** 1.5.0
+A versatile web based messenger using IRC
+
+###Features:
+
+- For single networks, bouncer hosts, or a personal generic IRC client that remembers your networks
+- Works out of the box with a default IRC network - or use your own
+- Single or multiple IRC network connections
+- Light and dark modes
+- Desktop notifications
+- Extremely versatile via a single JSON config file at runtime
+
+
+**Version incluse :** 1.5.0~ynh1
+
+**Démo :** https://kiwiirc.com/nextclient
 
 ## Captures d'écran
 
-![](https://kiwiirc.com/img/screenshot.png)
+![](./doc/screenshots/screenshot.png)
 
-## Démo
+## Documentations et ressources
 
-* [Démo officielle]()
+* Site officiel de l'app : https://kiwiirc.com/
-
+* Documentation officielle utilisateur : https://yunohost.org/apps
-## Configuration
+* Documentation officielle de l'admin : https://github.com/kiwiirc/kiwiirc/wiki
-
+* Dépôt de code officiel de l'app : https://github.com/kiwiirc/kiwiirc
-## Documentation
+* Documentation YunoHost pour cette app : https://yunohost.org/app_kiwiirc
-
+* Signaler un bug : https://github.com/YunoHost-Apps/kiwiirc_ynh/issues
- * Documentation officielle : https://github.com/kiwiirc/kiwiirc/wiki
- * Documentation YunoHost : 
-
-## Caractéristiques spécifiques YunoHost
-
-#### Support multi-utilisateur
-
-* L'authentification LDAP est-elle prise en charge ? **Oui**
-* 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/kiwiirc%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/kiwiirc/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/kiwiirc%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/kiwiirc/)
-
-## Liens
-
- * Signaler un bug : https://github.com/YunoHost-Apps/kiwiirc_ynh/issues
- * Dépôt de l'application principale : https://github.com/kiwiirc/kiwiirc
- * Site web YunoHost : https://yunohost.org/
-
----
 
 ## Informations pour les développeurs
 
@@ -58,3 +50,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/kiwiirc_ynh/tree/test
 ou
 sudo yunohost app upgrade kiwiirc -u https://github.com/YunoHost-Apps/kiwiirc_ynh/tree/testing --debug
 ```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps

check_process

@@ -1,9 +1,9 @@
 ;; Test complet
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
+		domain="domain.tld"
-		path="/path"        (PATH)
+		path="/path"
-		admin="john"	    (USER)
+		admin="john"
-		is_public=1	        (PUBLIC|public=1|private=0)
+		is_public=1
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -14,12 +14,9 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=0
-		port_already_use=0
 		change_url=1
-;;; Levels
-	Level 5=auto
 ;;; Options
 Email=
 Notification=none
 ;;; Upgrade options
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&
+		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&

conf/config.conf.example

@@ -88,9 +88,9 @@ kiwiirc
 
 # Connections will be sent to a random upstream
 [upstream.1]
-hostname = "chat.freenode.net"
+hostname = "irc.libera.chat"
-port = 6667
+port = 6697
-tls = false
+tls = true
 # Connection timeout in seconds
 timeout = 5
 # Throttle the lines being written by X per second

conf/config.json.example

@@ -1,7 +1,7 @@
 {
     "windowTitle": "Kiwi IRC",
     "startupScreen": "welcome",
-    "kiwiServer": "https://__DOMAIN__/webirc/kiwiirc/",
+    "kiwiServer": "https://__DOMAIN____PATH__",
     "restricted": false,
     "theme": "Default",
     "themes": [

conf/systemd.service

@@ -4,8 +4,8 @@ Documentation=https://github.com/kiwiirc/webircgateway
 After=network.target
 
 [Service]
-User=www-data
+User=__APP__
-Group=www-data
+Group=__APP__
 ExecStart=/var/www/webircgateway/kiwiirc --config=/var/www/webircgateway/config.conf
 ExecReload=/usr/bin/kill -USR1 $MAINPID
 LimitNOFILE=1048576

doc/DESCRIPTION.md

@@ -0,0 +1,10 @@
+A versatile web based messenger using IRC
+
+###Features:
+
+- For single networks, bouncer hosts, or a personal generic IRC client that remembers your networks
+- Works out of the box with a default IRC network - or use your own
+- Single or multiple IRC network connections
+- Light and dark modes
+- Desktop notifications
+- Extremely versatile via a single JSON config file at runtime

manifest.json

@@ -3,17 +3,25 @@
     "id": "kiwiirc",
     "packaging_format": 1,
     "description": {
-        "en": "",
+        "en": "A versatile web based messenger using IRC",
-        "fr": ""
+        "fr": "Une messagerie Web polyvalente utilisant IRC"
     },
     "version": "1.5.0~ynh1",
     "url": "https://github.com/kiwiirc/kiwiirc",
+    "upstream": {
+        "license": "AGPL-3.0-only",
+        "website": "https://kiwiirc.com/",
+        "demo": "https://kiwiirc.com/nextclient",
+        "admindoc": "https://github.com/kiwiirc/kiwiirc/wiki",
+        "userdoc": "https://yunohost.org/apps",
+        "code": "https://github.com/kiwiirc/kiwiirc"
+    },
     "license": "AGPL-3.0-only",
     "maintainer": {
         "name": ""
     },
     "requirements": {
-        "yunohost": ">= 3.8.1"
+        "yunohost": ">= 4.2.4"
     },
     "multi_instance": false,
     "services": [
@@ -24,29 +32,17 @@
             {
                 "name": "domain",
                 "type": "domain",
-                "ask": {
-                    "en": "Choose a domain name for KiwiIRC",
-                    "fr": "Choisissez un nom de domaine pour KiwiIRC"
-                },
                 "example": "domain.org"
             },
             {
                 "name": "path",
                 "type": "path",
-                "ask": {
-                    "en": "Choose a path for KiwiIRC",
-                    "fr": "Choisissez un chemin pour KiwiIRC"
-                },
                 "example": "/kiwiirc",
                 "default": "/kiwiirc"
             },
             {
                 "name": "is_public",
                 "type": "boolean",
-                "ask": {
-                    "en": "Is it a public site?",
-                    "fr": "Est-ce un site public ?"
-                },
                 "help": {
                     "en": "If enabled, KiwiIRC will be accessible by people who do not have an account. This can be changed later via the webadmin.",
                     "fr": "Si cette case est cochée, KiwiIRC sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."

pull_request_template.md

@@ -1,18 +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
----
-*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/job/kiwiirc_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/kiwiirc_ynh%20PR-NUM-%20(USERNAME)/)  

scripts/install

@@ -13,9 +13,6 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-ynh_clean_setup () {
-	ynh_clean_check_starting
-}
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
@@ -40,27 +37,31 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde
 # Register (book) web path
 ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 
-mkdir -p /var/www/webircgateway
-webircgateway_path=/var/www/webircgateway
-
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
 ynh_script_progression --message="Storing installation settings..." --weight=2
 
-ynh_app_setting_set --app=$app --key=domain    --value=$domain
+ynh_app_setting_set --app=$app --key=domain --value=$domain
-ynh_app_setting_set --app=$app --key=path      --value=$path_url
+ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set --app=$app --key=is_public --value=$is_public
 
 #=================================================
 # FIND AND OPEN A PORT
 #=================================================
-ynh_script_progression --message="Configuring firewall..." --weight=1
+ynh_script_progression --message="Finding an available port..." --weight=1
 
 # Find an available port
 port=$(ynh_find_port --port=7778)
 ynh_app_setting_set --app=$app --key=port --value=$port
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Configuring system user..." --weight=3
+
+# Create a system user
+ynh_system_user_create --username=$app --home_dir=$final_path
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -70,8 +71,26 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path"
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
+#=================================================
+#CREAT GATEWAYPATH
+#=================================================
+ynh_script_progression --message="Setting up gatheway path..." --weight=2
+
+webircgateway_path=/var/www/webircgateway
+mkdir -p $webircgateway_path
+
+ynh_app_setting_set --app=$app --key=webircgateway_path --value=$webircgateway_path
+
 mv ../sources/webircgateway/* $webircgateway_path
 
+chmod 750 "$webircgateway_path"
+chmod -R o-rwx "$webircgateway_path"
+chown -R $app:www-data "$webircgateway_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -80,14 +99,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..." --weight=3
-
-# Create a system user
-ynh_system_user_create --username=$app --home_dir=$final_path
-
 #=================================================
 # SETUP SYSTEMD
 #=================================================
@@ -101,31 +112,15 @@ ynh_add_systemd_config
 #=================================================
 ynh_script_progression --message="Modifying a config file..."
 
-cp ../conf/config.json.example "$final_path/static/config.json"
+ynh_add_config --template="../conf/config.json.example" --destination="$final_path/static/config.json"
-
+ynh_add_config --template="../conf/config.conf.example" --destination="$webircgateway_path/config.conf"
-# Main config File
-ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/static/config.json"
-
-cp ../conf/config.conf.example "$webircgateway_path/config.conf"
-
-ynh_store_file_checksum --file="$final_path/static/config.json"
-ynh_store_file_checksum --file="$webircgateway_path/config.conf"
-
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-ynh_script_progression --message="Securing files and directories..."
-
-# Set permissions to app files
-chown -R $app:$app $final_path
-chown -R www-data:www-data $webircgateway_path
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description "A short description of the app" --log "/var/log/$app/$app.log"
+yunohost service add $app --description="Versatile web based messenger using IRC" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -133,7 +128,7 @@ yunohost service add $app --description "A short description of the app" --log "
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
 #=================================================
 # SETUP SSOWAT
@@ -143,7 +138,7 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=1
 # Make app public if necessary or protect it
 if [ $is_public -eq 1 ]
 then
-	ynh_permission_update --permission "main" --add "visitors"
+	ynh_permission_update --permission="main" --add="visitors"
 fi
 
 #=================================================

scripts/restore

@@ -35,8 +35,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 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 "
 
@@ -47,6 +45,14 @@ ynh_script_progression --message="Restoring the NGINX configuration..."
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
+#=================================================
+# RECREATE THE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
+
+# Create the dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -54,21 +60,9 @@ ynh_script_progression --message="Restoring KiwiIRC main directory..." --weight=
 
 ynh_restore_file --origin_path="$final_path"
 
-#=================================================
+chmod 750 "$final_path"
-# RECREATE THE DEDICATED USER
+chmod -R o-rwx "$final_path"
-#=================================================
+chown -R $app:www-data "$final_path"
-ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
-
-# Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app
-
-#=================================================
-# RESTORE USER RIGHTS
-#=================================================
-ynh_script_progression --message="Restoring user rights..." --weight=1
-
-# Restore permissions on app files
-chown -R $app:$app $final_path
 
 #=================================================
 # RESTORE SYSTEMD
@@ -76,21 +70,21 @@ chown -R $app:$app $final_path
 ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
-systemctl enable $app.service
+systemctl enable $app.service --quiet
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description "A short description of the app" --log "/var/log/$app/$app.log"
+yunohost service add $app --description="Versatile web based messenger using IRC" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
 #=================================================
 # RELOAD NGINX

scripts/upgrade

@@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 port=$(ynh_app_setting_get --app=$app --key=port)
 
@@ -43,6 +42,26 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
+#=================================================
+# ENSURE DOWNWARD COMPATIBILITY
+#=================================================
+ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
+
+# Cleaning legacy permissions
+if ynh_legacy_permissions_exists; then
+	ynh_legacy_permissions_delete_all
+
+	ynh_app_setting_delete --app=$app --key=is_public
+fi
+
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -70,6 +89,10 @@ then
 	ynh_secure_remove --file="$tmpdir"
 fi
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -79,20 +102,19 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 ynh_add_nginx_config
 
 #=================================================
-# CREATE DEDICATED USER
+# INTEGRATE SERVICE IN YUNOHOST
 #=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-# Create a dedicated user (if not existing)
+yunohost service add $app --description="Versatile web based messenger using IRC" --log="/var/log/$app/$app.log"
-ynh_system_user_create --username=$app
 
 #=================================================
-# SECURE FILES AND DIRECTORIES
+# START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Securing files and directories..." --weight=1
+ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-# Set permissions on app files
+# Start a systemd service
-chown -R $app:$app $final_path
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
 #=================================================
 # RELOAD NGINX