mirror of
https://github.com/YunoHost-Apps/wekan_ynh.git
synced 2024-09-03 20:36:09 +02:00
Merge branch 'testing' into upgrade
This commit is contained in:
yalh76
commit
d72981dea7
11 changed files with 21 additions and 61 deletions
|
|
@ -27,7 +27,6 @@ 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.
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ 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.
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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__>'
|
||||
# Currently MAIL_SERVICE is not in use.
|
||||
#MAIL_SERVICE=Outlook365
|
||||
|
|
@ -377,7 +377,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
|
||||
|
|
|
|||
|
|
@ -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__;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
* 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.
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
@ -29,7 +28,7 @@
|
|||
}
|
||||
],
|
||||
"requirements": {
|
||||
"yunohost": ">= 4.2.0"
|
||||
"yunohost": ">= 4.3.1.8"
|
||||
},
|
||||
"multi_instance": true,
|
||||
"services": [
|
||||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
@ -125,6 +123,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"
|
||||
|
|
|
|||
|
|
@ -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 "
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
@ -180,6 +178,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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
Loading…
Reference in a new issue