Merge pull request #20 from YunoHost-Apps/testing

Testing

.github/workflows/updater.sh

@@ -63,7 +63,7 @@ echo "Handling asset at $asset_url"
 # Here we base the source file name upon a unique keyword in the assets url (admin vs. update)
 # Leave $src empty to ignore the asset
 case $asset_url in
-  *".tar.gz"*)
+  *"focalboard-server-linux-amd64.tar.gz")
     src="app"
     ;;
 esac

README.md

@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Focalboard is a project management tool that helps define, organize, track and manage work across teams, using a familiar kanban board view.
 
 
-**Shipped version:** 0.9.0~ynh1
+**Shipped version:** 0.10.0~ynh1
 
 
 

README_fr.md

@@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 Focalboard est un outil de gestion de projet qui aide à définir, organiser, suivre et gérer le travail entre les équipes, à l'aide d'une vue de tableau kanban familière.
 
 
-**Version incluse :** 0.9.0~ynh1
+**Version incluse :** 0.10.0~ynh1
 
 
 

check_process

@@ -11,7 +11,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		#upgrade=1	from_commit=CommitHash
+		upgrade=1	from_commit=258c87b605e67719938fc3c9d08aec369485d7d2
 		backup_restore=1
 		multi_instance=0
 		change_url=1
@@ -19,6 +19,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=CommitHash
-		name=Name and date of the commit.
+	; commit=258c87b605e67719938fc3c9d08aec369485d7d2
+		name=Merge pull request #14 
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/mattermost/focalboard/releases/download/v0.9.0-rc7/focalboard-server-linux-amd64.tar.gz
-SOURCE_SUM=2aca013398814c70f8f50669c22d053a16867f63ae56c81c4a2295f43bbac3a4
+SOURCE_URL=https://github.com/mattermost/focalboard/releases/download/v0.10.0/focalboard-server-linux-amd64.tar.gz
+SOURCE_SUM=a618ed7281b239fc3adf808c599d24ad56ac22e253cd0c76a7cd51b5256fd2c8
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/nginx.conf

@@ -19,12 +19,6 @@ location ~ /ws/* {
 }
 
 location / {
-
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   client_max_body_size 50M;
   proxy_pass http://127.0.0.1:__PORT__;
   proxy_set_header Connection "";

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.9.0~ynh1",
+    "version": "0.10.0~ynh1",
     "url": "https://www.focalboard.com/",
     "upstream": {
         "license": "MIT",
@@ -20,7 +20,7 @@
         "name": "eric_G"
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": false,
     "services": [
@@ -31,8 +31,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "is_public",

scripts/backup

@@ -43,7 +43,12 @@ ynh_print_info --message="Declaring files to be backed up..."
 #=================================================
 
 ynh_backup --src_path="$final_path"
-ynh_backup --src_path="$files_path"
+
+#=================================================
+# BACKUP THE DATA DIR
+#=================================================
+
+ynh_backup --src_path="$files_path" --is_big
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION

scripts/install

@@ -101,13 +101,16 @@ chown -R $app:www-data "$final_path"
 #=================================================
 # CREATE DIRECTORIES
 #=================================================
+ynh_script_progression --message="Creating a data directory..." --weight=1
 
 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
+chmod -R o-rwx $files_path
+chown -R $app:www-data $files_path
 
 #=================================================
 # NGINX CONFIGURATION

scripts/remove

@@ -21,6 +21,7 @@ port=$(ynh_app_setting_get --app=$app --key=port)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+files_path=$(ynh_app_setting_get --app=$app --key=files_path)
 
 #=================================================
 # STANDARD REMOVE
@@ -67,6 +68,17 @@ ynh_script_progression --message="Removing app main directory..." --weight=4
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
 
+#=================================================
+# REMOVE DATA DIR
+#=================================================
+
+# Remove the data directory if --purge option is used
+if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
+then
+	ynh_script_progression --message="Removing app data directory..." --weight=1
+	ynh_secure_remove --file="$files_path"
+fi
+
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================

scripts/restore

@@ -71,10 +71,18 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-ynh_restore_file --origin_path="$files_path"
+#=================================================
+# RESTORE THE DATA DIRECTORY
+#=================================================
+ynh_script_progression --message="Restoring the data directory..." --weight=1
 
-chown -R $app:www-data $files_path
-chmod -R 755 $files_path
+ynh_restore_file --origin_path="$files_path" --not_mandatory
+
+mkdir -p files_path
+
+chmod 755 "$files_path"
+chmod -R o-rwx "$files_path"
+chown -R $app:www-data "$files_path"
 
 #=================================================
 # SPECIFIC RESTORATION