Merge pull request #7 from YunoHost-Apps/testing

Testing

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.
@@ -10,35 +6,28 @@ It shall NOT be edited by hand.
 # Focalboard for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/focalboard.svg)](https://dash.yunohost.org/appci/app/focalboard) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.maintain.svg)  
-[![Install focalboard with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=focalboard)
+[![Install Focalboard with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=focalboard)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install focalboard quickly and simply on a YunoHost server.
+> *This package allows you to install Focalboard 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
 
 Self-hosted alternative to Trello, Notion, and Asana
 
-**Shipped version:** 0.6.7~ynh1
+**Shipped version:** 0.7.0~ynh1
-
 
 
 
 ## Screenshots
 
-
 ![](./doc/screenshots/screenshot.jpg)
 
-
-
-
-
 ## Documentation and resources
 
 * Official app website: https://www.focalboard.com/
-
 * Official admin documentation: https://www.focalboard.com/guide/user/
 * Upstream app code repository: https://github.com/mattermost/focalboard
 * YunoHost documentation for this app: https://yunohost.org/app_focalboard

README_fr.md

@@ -1,40 +1,33 @@
 # Focalboard pour YunoHost
 
 [![Niveau d'intégration](https://dash.yunohost.org/integration/focalboard.svg)](https://dash.yunohost.org/appci/app/focalboard) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.maintain.svg)  
-[![Installer focalboard avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=focalboard)
+[![Installer Focalboard avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=focalboard)
 
 *[Read this readme in english.](./README.md)*
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install focalboard quickly and simply on a YunoHost server.
+> *Ce package vous permet d'installer Focalboard 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
 
 Alternative auto-hébergée à Trello, Notion et Asana
 
-**Version incluse:** 0.6.7~ynh1
+**Version incluse :** 0.7.0~ynh1
-
 
 
 
 ## Captures d'écran
 
-
 ![](./doc/screenshots/screenshot.jpg)
 
-
-
-
-
 ## Documentations et ressources
 
-* Site official de l'app : https://www.focalboard.com/
+* Site officiel de l'app : https://www.focalboard.com/
-
+* Documentation officielle de l'admin : https://www.focalboard.com/guide/user/
-* Documentation officielle de l'admin: https://www.focalboard.com/guide/user/
+* Dépôt de code officiel de l'app : https://github.com/mattermost/focalboard
-* Dépôt de code officiel de l'app:  https://github.com/mattermost/focalboard
+* Documentation YunoHost pour cette app : https://yunohost.org/app_focalboard
-* Documentation YunoHost pour cette app: https://yunohost.org/app_focalboard
+* Signaler un bug : https://github.com/YunoHost-Apps/focalboard_ynh/issues
-* Signaler un bug: https://github.com/YunoHost-Apps/focalboard_ynh/issues
 
 ## Informations pour les développeurs
 
@@ -43,8 +36,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/focalboard_ynh/tree/testing --debug
-or
+ou
 sudo yunohost app upgrade focalboard -u https://github.com/YunoHost-Apps/focalboard_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

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/mattermost/focalboard/releases/download/v0.6.7/focalboard-server-linux-amd64.tar.gz
+SOURCE_URL=https://github.com/mattermost/focalboard/releases/download/v0.7.0/focalboard-server-linux-amd64.tar.gz
-SOURCE_SUM=df35b7cd51dcdcfaf0e12df40a99dfa9cee579deaa535d6f5597d81ed95bfa4a
+SOURCE_SUM=39e00162517f7b41536d618bfee7223635bce2ce5844f25283b99b26c40a2a80
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/nginx.conf

@@ -1,3 +1,23 @@
+location ~ /ws/ {
+  proxy_pass http://127.0.0.1:__PORT__;
+  proxy_set_header Upgrade $http_upgrade;
+  proxy_set_header Connection "upgrade";
+  client_max_body_size 50M;
+  proxy_set_header Host $http_host;
+  proxy_set_header X-Real-IP $remote_addr;
+  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  proxy_set_header X-Forwarded-Proto $scheme;
+  proxy_set_header X-Frame-Options SAMEORIGIN;
+  proxy_buffers 256 16k;
+  proxy_buffer_size 16k;
+  client_body_timeout 60;
+  send_timeout 300;
+  lingering_timeout 5;
+  proxy_connect_timeout 1d;
+  proxy_send_timeout 1d;
+  proxy_read_timeout 1d;
+}
+
 location / {
 
   # Force usage of https
@@ -6,8 +26,9 @@ location / {
   }
 
   client_max_body_size 50M;
-  proxy_pass http://127.0.0.1:__PORT__/;
+  
-  proxy_set_header Connection "";
+  proxy_pass http://127.0.0.1:__PORT__;
+  proxy_set_header Connection "upgrade";
   proxy_set_header Host $http_host;
   proxy_set_header X-Real-IP $remote_addr;
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -27,26 +48,6 @@ location / {
   more_clear_input_headers 'Accept-Encoding';
 }
 
-location /ws/ {
-  proxy_pass http://127.0.0.1:__PORT__/;
-  proxy_set_header Upgrade $http_upgrade;
-  proxy_set_header Connection "upgrade";
-  client_max_body_size 50M;
-  proxy_set_header Host $http_host;
-  proxy_set_header X-Real-IP $remote_addr;
-  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  proxy_set_header X-Forwarded-Proto $scheme;
-  proxy_set_header X-Frame-Options SAMEORIGIN;
-  proxy_buffers 256 16k;
-  proxy_buffer_size 16k;
-  client_body_timeout 60;
-  send_timeout 300;
-  lingering_timeout 5;
-  proxy_connect_timeout 1d;
-  proxy_send_timeout 1d;
-  proxy_read_timeout 1d;
-}
-
 location /uploads/ {
         alias __FILES_PATH__/uploads/ ;
 }

manifest.json

@@ -6,7 +6,7 @@
         "en": "Self-hosted alternative to Trello, Notion, and Asana",
         "fr": "Alternative auto-hébergée à Trello, Notion et Asana"
     },
-    "version": "0.6.7~ynh1",
+    "version": "0.7.0~ynh1",
     "url": "https://www.focalboard.com/",
     "upstream": {
         "license": "MIT",
@@ -19,7 +19,7 @@
         "name": "John doe"
     },
     "requirements": {
-        "yunohost": ">= 4.1.7"
+        "yunohost": ">= 4.2.4"
     },
     "multi_instance": false,
     "services": [

scripts/_common.sh

@@ -3,6 +3,7 @@
 #=================================================
 # COMMON VARIABLES
 #=================================================
+
 # dependencies used by the app
 pkg_dependencies="postgresql postgresql-contrib"
 

scripts/backup

@@ -29,6 +29,7 @@ ynh_print_info --message="Loading installation settings..."
 app=$YNH_APP_INSTANCE_NAME
 
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+files_path=$(ynh_app_setting_get --app=$app --key=files_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 
@@ -42,6 +43,7 @@ ynh_print_info --message="Declaring files to be backed up..."
 #=================================================
 
 ynh_backup --src_path="$final_path"
+ynh_backup --src_path="$files_path"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION

scripts/change_url

@@ -29,6 +29,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 port=$(ynh_app_setting_get --app=$app --key=port)
+files_path=$(ynh_app_setting_get --app=$app --key=files_path)
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP

scripts/install

@@ -94,6 +94,10 @@ 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"
+
 #=================================================
 # CREATE DIRECTORIES
 #=================================================
@@ -102,6 +106,8 @@ files_path=/home/yunohost.app/$app
 ynh_app_setting_set --app=$app --key=files_path --value=$files_path
 
 mkdir -p $files_path/files
+chown -R $app:www-data $files_path
+chmod -R 755 $files_path
 
 #=================================================
 # NGINX CONFIGURATION
@@ -124,18 +130,6 @@ ynh_add_systemd_config
 #=================================================
 
 ynh_add_config --template="../conf/config.json" --destination="$final_path/config.json"
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions to app files
-chown -R $app:$app $final_path
-chown -R $app:$app $files_path
-#chmod -R o-rwx $final_path
-chmod -R 755 $files_path
 chmod 600 $final_path/config.json
 
 #=================================================

scripts/restore

@@ -31,6 +31,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+files_path=$(ynh_app_setting_get --app=$app --key=files_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
@@ -53,13 +54,6 @@ test ! -d $final_path \
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# RESTORE THE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Restoring the app main directory..." --weight=1
-
-ynh_restore_file --origin_path="$final_path"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@@ -69,13 +63,20 @@ ynh_script_progression --message="Recreating the dedicated system user..." --wei
 ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
-# RESTORE USER RIGHTS
+# RESTORE THE APP MAIN DIR
 #=================================================
+ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
-# Restore permissions on app files
+ynh_restore_file --origin_path="$final_path"
-chown -R $app:$app $final_path
+
-#chmod -R o-rwx $final_path
+chmod 750 "$final_path"
-chmod 600 $final_path/config.json
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
+ynh_restore_file --origin_path="$files_path"
+
+chown -R $app:www-data $files_path
+chmod -R 755 $files_path
 
 #=================================================
 # SPECIFIC RESTORATION

scripts/upgrade

@@ -20,8 +20,8 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-files_path=$(ynh_app_setting_get --app=$app --key=files_path)
 port=$(ynh_app_setting_get --app=$app --key=port)
+files_path=$(ynh_app_setting_get --app=$app --key=files_path)
 
 #=================================================
 # CHECK VERSION
@@ -64,6 +64,14 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log"
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=3
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -82,8 +90,7 @@ then
 	ynh_secure_remove --file="$final_path"
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" #--keep="foo bar" to integrate when https://github.com/YunoHost/yunohost/pull/1200 is upstream
+	ynh_setup_source --dest_dir="$final_path" #--keep="$final_path/config.json"
-
 	# Copy the admin saved settings from tmp directory to final path	
 	cp -a "$tmpdir/config.json" "$final_path/config.json" 
 
@@ -91,6 +98,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
 #=================================================
@@ -106,14 +117,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=2
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=3
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
 #=================================================
 # SETUP SYSTEMD
 #=================================================
@@ -122,19 +125,6 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions on app files
-chown -R $app:$app $final_path
-chown -R $app:$app $files_path
-#chmod -R o-rwx "$final_path"
-chmod -R 755 $files_path
-chmod 600 $final_path/config.json
-
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================