From 17d6f11ba1beffce57641408ea10e88f980c3ddd Mon Sep 17 00:00:00 2001
From: Tagada <36127788+Tagadda@users.noreply.github.com>
Date: Wed, 5 Jan 2022 22:24:11 +0100
Subject: [PATCH 1/6] Allow login using mail

---
 conf/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/.env b/conf/.env
index d376d19..16ca3f8 100644
--- a/conf/.env
+++ b/conf/.env
@@ -302,7 +302,7 @@ LDAP_USER_SEARCH_SCOPE=sub
 # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
 # example :  LDAP_USER_SEARCH_FIELD=uid
 #LDAP_USER_SEARCH_FIELD=
-LDAP_USER_SEARCH_FIELD=uid
+LDAP_USER_SEARCH_FIELD=uid,mail
 # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
 # example :  LDAP_SEARCH_PAGE_SIZE=12345
 #LDAP_SEARCH_PAGE_SIZE=0

From 3af71d03fc67e46c0f7606a0f9a2ec221be00ab9 Mon Sep 17 00:00:00 2001
From: Tagada <36127788+Tagadda@users.noreply.github.com>
Date: Wed, 5 Jan 2022 22:30:11 +0100
Subject: [PATCH 2/6] Use main domain to send mail

Fix #132
---
 conf/.env       | 2 +-
 scripts/install | 2 ++
 scripts/upgrade | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/conf/.env b/conf/.env
index 16ca3f8..5b638cf 100644
--- a/conf/.env
+++ b/conf/.env
@@ -22,7 +22,7 @@ ROOT_URL='https://__DOMAIN____PATH__'
 # https://github.com/wekan/wekan/wiki/Adding-users
 # https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
 # https://github.com/wekan/wekan-mongodb/blob/master/docker-compose.yml
-MAIL_URL='smtp://localhost:25/'
+MAIL_URL='smtp://__MAIN_DOMAIN__:25/'
 MAIL_FROM='Wekan Support <wekan@__DOMAIN__>'
 #---------------------------------------------
 #KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011
diff --git a/scripts/install b/scripts/install
index b775cf5..65fc7ef 100644
--- a/scripts/install
+++ b/scripts/install
@@ -125,6 +125,8 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a config file..."
 
+main_domain=$(cat /etc/yunohost/current_host)
+
 ynh_add_config --template=".env" --destination="$final_path/.env"
 
 chmod 400 "$final_path/.env"
diff --git a/scripts/upgrade b/scripts/upgrade
index efe8f7a..2ddddc3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -180,6 +180,8 @@ ynh_install_mongo
 #=================================================
 ynh_script_progression --message="Updating a config file..."
 
+main_domain=$(cat /etc/yunohost/current_host)
+
 ynh_add_config --template=".env" --destination="$final_path/.env"
 
 chmod 400 "$final_path/.env"

From f1e3de0d77c3a6c4c8d64b5d725f710de7a48e79 Mon Sep 17 00:00:00 2001
From: Tagada <36127788+Tagadda@users.noreply.github.com>
Date: Thu, 6 Jan 2022 00:37:03 +0100
Subject: [PATCH 3/6] [4.3] Use $YNH_ARCH instead of ynh_detect_arch

---
 conf/{x86-64.src => amd64.src} |  0
 manifest.json                  |  4 ++--
 scripts/install                |  6 ++----
 scripts/upgrade                |  4 +---
 scripts/ynh_detect_arch__2     | 25 -------------------------
 5 files changed, 5 insertions(+), 34 deletions(-)
 rename conf/{x86-64.src => amd64.src} (100%)
 delete mode 100644 scripts/ynh_detect_arch__2

diff --git a/conf/x86-64.src b/conf/amd64.src
similarity index 100%
rename from conf/x86-64.src
rename to conf/amd64.src
diff --git a/manifest.json b/manifest.json
index 6a4936e..2ae58e1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Trello-like kanban",
         "fr": "Un kanban similaire à Trello"
     },
-    "version": "5.35~ynh1",
+    "version": "5.35~ynh2",
     "url": "https://wekan.github.io",
     "upstream": {
         "license": "MIT",
@@ -29,7 +29,7 @@
         }
     ],
     "requirements": {
-        "yunohost": ">= 4.2.0"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/install b/scripts/install
index 65fc7ef..01faa4e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -7,7 +7,6 @@
 #=================================================
 
 source _common.sh
-source ynh_detect_arch__2
 source ynh_mongo_db
 source /usr/share/yunohost/helpers
 
@@ -37,9 +36,8 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 ynh_script_progression --message="Validating installation parameters..."
 
-architecture=$(ynh_detect_arch)
 # Check machine architecture (in particular, we don't support ARM and 32bit machines)
-if [ $architecture == "i386" ] || [ $architecture == "arm" ]
+if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armel" ]
 then
 	ynh_die --message="Sorry, but this app can only be installed on a x86, 64 bits machine :("
 fi
@@ -104,7 +102,7 @@ ynh_script_progression --message="Setting up source files..."
 
 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" --source_id="$architecture"
+ynh_setup_source --dest_dir="$final_path" --source_id="$YNH_ARCH"
 
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
diff --git a/scripts/upgrade b/scripts/upgrade
index 2ddddc3..9cd5e08 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -8,7 +8,6 @@
 
 source _common.sh
 source ynh_package_version
-source ynh_detect_arch__2
 source ynh_mongo_db
 source /usr/share/yunohost/helpers
 
@@ -139,9 +138,8 @@ then
 	# Remove the app directory securely
 	ynh_secure_remove --file="$final_path"
 
-	architecture=$(ynh_detect_arch)
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --source_id="$architecture"
+	ynh_setup_source --dest_dir="$final_path" --source_id="$YNH_ARCH"
   
 	#Copy the admin saved settings from tmp directory to final path
 	cp -af "$tmpdir/.env" "$final_path/.env"
diff --git a/scripts/ynh_detect_arch__2 b/scripts/ynh_detect_arch__2
deleted file mode 100644
index b1c7375..0000000
--- a/scripts/ynh_detect_arch__2
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# Check the architecture
-#
-# example: architecture=$(ynh_detect_arch)
-#
-# usage: ynh_detect_arch
-#
-# Requires YunoHost version 2.2.4 or higher.
-
-ynh_detect_arch(){
-	local architecture
-	if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then
-		architecture="arm64"
-	elif [ -n "$(uname -m | grep 64)" ]; then
-		architecture="x86-64"
-	elif [ -n "$(uname -m | grep 86)" ]; then
-		architecture="i386"
-	elif [ -n "$(uname -m | grep arm)" ]; then
-		architecture="arm"
-	else
-		architecture="unknown"
-	fi
-	echo $architecture
-}

From 312a7e95e1bf1afb8e8e010d579ea668faf39320 Mon Sep 17 00:00:00 2001
From: Tagada <36127788+Tagadda@users.noreply.github.com>
Date: Thu, 6 Jan 2022 00:36:00 +0100
Subject: [PATCH 4/6] Fix linter

---
 conf/nginx.conf   | 5 -----
 doc/DISCLAIMER.md | 7 +++----
 manifest.json     | 7 ++-----
 scripts/restore   | 2 --
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index e35471d..26774a9 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,10 +1,5 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   client_max_body_size 100M;
 
   proxy_pass http://127.0.0.1:__PORT__;
diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
index 75d55ed..3d56c28 100644
--- a/doc/DISCLAIMER.md
+++ b/doc/DISCLAIMER.md
@@ -1,7 +1,6 @@
-* Any known limitations, constrains or stuff not working, such as (but not limited to):
-    * There is currently **no SSO integration** though it might be integrated at some point in the app, now that it's supported in Meteor/Wekan. In the meantime, users can create accounts (in fact, they can create infinite number of accounts) manually, and need to login manually specifically in Wekan.
-    * This app **only works on x86, 64bits architecture**! In particular, it won't work on 32 bit machines or ARM. See the discussion [here](https://github.com/YunoHost-Apps/wekan_ynh/issues/1#issuecomment-401612500).
-    * YunoHost users with more than one email address can't login to wekan using ldap. For example first YunoHost user has severals email addresses: root@domain; admin@domain; webmaster@domain; postmaster@domain, etc... Workaround: remove all mail aliases of the user you want to connect, connect one time on wekan, recreate the aliases of the YunoHost user.
+* There is currently **no SSO integration** though it might be integrated at some point in the app, now that it's supported in Meteor/Wekan. In the meantime, users can create accounts (in fact, they can create infinite number of accounts) manually, and need to login manually specifically in Wekan.
+* This app **only works on x86, 64bits architecture**! In particular, it won't work on 32 bit machines or ARM. See the discussion [here](https://github.com/YunoHost-Apps/wekan_ynh/issues/1#issuecomment-401612500).
+* YunoHost users with more than one email address can't login to wekan using ldap. For example first YunoHost user has severals email addresses: root@domain; admin@domain; webmaster@domain; postmaster@domain, etc... Workaround: remove all mail aliases of the user you want to connect, connect one time on wekan, recreate the aliases of the YunoHost user.
 
 ## Configuration:
 As LDAP authentification is enabled by default, Wekan admins correspond to the permission `Wekan Admin`. The user you choose during installation is member of this group.
diff --git a/manifest.json b/manifest.json
index 2ae58e1..a86b9b5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -11,7 +11,6 @@
     "upstream": {
         "license": "MIT",
         "website": "https://wekan.github.io",
-        "userdoc": "https://yunohost.org/#/app_wekan",
         "code": "https://github.com/wekan/wekan"
     },
     "license": "MIT",
@@ -39,8 +38,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "path",
@@ -50,8 +48,7 @@
             },
             {
                 "name": "admin",
-                "type": "user",
-                "example": "johndoe"
+                "type": "user"
             },
             {
                 "name": "is_public",
diff --git a/scripts/restore b/scripts/restore
index 739b02e..fb660a9 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -39,8 +39,6 @@ db_user=$db_name
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..."
 
-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 "
 

From 156938e39f67737637331f585992036496fab81e Mon Sep 17 00:00:00 2001
From: Tagada <36127788+Tagadda@users.noreply.github.com>
Date: Thu, 6 Jan 2022 23:39:02 +0100
Subject: [PATCH 5/6] Update manifest.json

Co-authored-by: yalh76 <yalh@yahoo.com>
---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index a86b9b5..8420ed9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -28,7 +28,7 @@
         }
     ],
     "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 4.3.1.8"
     },
     "multi_instance": true,
     "services": [

From 084cafac8d95abe44ed361f18c89ad0f39ad1944 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Fri, 14 Jan 2022 22:20:19 +0000
Subject: [PATCH 6/6] Auto-update README

---
 README.md    | 10 ++++------
 README_fr.md | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 49d7aaa..740fdea 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Trello-like kanban
 
-**Shipped version:** 5.35~ynh1
+**Shipped version:** 5.35~ynh2
 
 
 
@@ -27,10 +27,9 @@ Trello-like kanban
 
 ## Disclaimers / important information
 
-* Any known limitations, constrains or stuff not working, such as (but not limited to):
-    * There is currently **no SSO integration** though it might be integrated at some point in the app, now that it's supported in Meteor/Wekan. In the meantime, users can create accounts (in fact, they can create infinite number of accounts) manually, and need to login manually specifically in Wekan.
-    * This app **only works on x86, 64bits architecture**! In particular, it won't work on 32 bit machines or ARM. See the discussion [here](https://github.com/YunoHost-Apps/wekan_ynh/issues/1#issuecomment-401612500).
-    * YunoHost users with more than one email address can't login to wekan using ldap. For example first YunoHost user has severals email addresses: root@domain; admin@domain; webmaster@domain; postmaster@domain, etc... Workaround: remove all mail aliases of the user you want to connect, connect one time on wekan, recreate the aliases of the YunoHost user.
+* There is currently **no SSO integration** though it might be integrated at some point in the app, now that it's supported in Meteor/Wekan. In the meantime, users can create accounts (in fact, they can create infinite number of accounts) manually, and need to login manually specifically in Wekan.
+* This app **only works on x86, 64bits architecture**! In particular, it won't work on 32 bit machines or ARM. See the discussion [here](https://github.com/YunoHost-Apps/wekan_ynh/issues/1#issuecomment-401612500).
+* YunoHost users with more than one email address can't login to wekan using ldap. For example first YunoHost user has severals email addresses: root@domain; admin@domain; webmaster@domain; postmaster@domain, etc... Workaround: remove all mail aliases of the user you want to connect, connect one time on wekan, recreate the aliases of the YunoHost user.
 
 ## Configuration:
 As LDAP authentification is enabled by default, Wekan admins correspond to the permission `Wekan Admin`. The user you choose during installation is member of this group.
@@ -48,7 +47,6 @@ If you have disable ldap authentication, first registered user will be admin, an
 ## Documentation and resources
 
 * Official app website: https://wekan.github.io
-* Official user documentation: https://yunohost.org/#/app_wekan
 * Upstream app code repository: https://github.com/wekan/wekan
 * YunoHost documentation for this app: https://yunohost.org/app_wekan
 * Report a bug: https://github.com/YunoHost-Apps/wekan_ynh/issues
diff --git a/README_fr.md b/README_fr.md
index cc0808b..9964600 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Un kanban similaire à Trello
 
-**Version incluse :** 5.35~ynh1
+**Version incluse :** 5.35~ynh2
 
 
 
@@ -23,10 +23,9 @@ Un kanban similaire à Trello
 
 ## Avertissements / informations importantes
 
-* Any known limitations, constrains or stuff not working, such as (but not limited to):
-    * There is currently **no SSO integration** though it might be integrated at some point in the app, now that it's supported in Meteor/Wekan. In the meantime, users can create accounts (in fact, they can create infinite number of accounts) manually, and need to login manually specifically in Wekan.
-    * This app **only works on x86, 64bits architecture**! In particular, it won't work on 32 bit machines or ARM. See the discussion [here](https://github.com/YunoHost-Apps/wekan_ynh/issues/1#issuecomment-401612500).
-    * YunoHost users with more than one email address can't login to wekan using ldap. For example first YunoHost user has severals email addresses: root@domain; admin@domain; webmaster@domain; postmaster@domain, etc... Workaround: remove all mail aliases of the user you want to connect, connect one time on wekan, recreate the aliases of the YunoHost user.
+* There is currently **no SSO integration** though it might be integrated at some point in the app, now that it's supported in Meteor/Wekan. In the meantime, users can create accounts (in fact, they can create infinite number of accounts) manually, and need to login manually specifically in Wekan.
+* This app **only works on x86, 64bits architecture**! In particular, it won't work on 32 bit machines or ARM. See the discussion [here](https://github.com/YunoHost-Apps/wekan_ynh/issues/1#issuecomment-401612500).
+* YunoHost users with more than one email address can't login to wekan using ldap. For example first YunoHost user has severals email addresses: root@domain; admin@domain; webmaster@domain; postmaster@domain, etc... Workaround: remove all mail aliases of the user you want to connect, connect one time on wekan, recreate the aliases of the YunoHost user.
 
 ## Configuration:
 As LDAP authentification is enabled by default, Wekan admins correspond to the permission `Wekan Admin`. The user you choose during installation is member of this group.
@@ -44,7 +43,6 @@ If you have disable ldap authentication, first registered user will be admin, an
 ## Documentations et ressources
 
 * Site officiel de l'app : https://wekan.github.io
-* Documentation officielle utilisateur : https://yunohost.org/#/app_wekan
 * Dépôt de code officiel de l'app : https://github.com/wekan/wekan
 * Documentation YunoHost pour cette app : https://yunohost.org/app_wekan
 * Signaler un bug : https://github.com/YunoHost-Apps/wekan_ynh/issues