From c47c0c34c629622508a63d50a1e37abf1aa44e7b Mon Sep 17 00:00:00 2001 From: Jonathan Bennetts Date: Tue, 7 Mar 2023 11:43:20 +0000 Subject: [PATCH 1/6] updated n8n to 0.218.0 --- README.md | 2 +- conf/.env | 1 + manifest.json | 2 +- scripts/_common.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a6f1669..66ce065 100755 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in n8n is an extendable workflow automation tool. With a fair-code distribution model, n8n will always have visible source code, be available to self-host, and allow you to add your own custom functions, logic and apps. n8n's node-based approach makes it highly versatile, enabling you to connect anything to everything. -**Shipped version:** 0.203.1~ynh1 +**Shipped version:** 0.218.0~ynh1 ## Screenshots diff --git a/conf/.env b/conf/.env index ae10826..d7d91a1 100644 --- a/conf/.env +++ b/conf/.env @@ -15,6 +15,7 @@ WEBHOOK_URL=https://__DOMAIN____PATH__ # Optional timezone to set which gets used by Cron-Node by default # If not set New York time will be used GENERIC_TIMEZONE=__TIMEZONE__ +TZ=__TIMEZONE__ # Use http (we're behind a reverse-proxy) N8N_PROTOCOL=http diff --git a/manifest.json b/manifest.json index ce18289..a22cba6 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Workflow Automation Tool. Easily automate tasks across different services", "fr": "Outil d'automatisation du flux de travail. Automatisez facilement les tâches sur différents services" }, - "version": "0.203.1~ynh1", + "version": "0.218.0~ynh1", "url": "https://n8n.io/", "upstream": { "license": "Apache-2.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index e0d5ea1..9ad0600 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ nodejs_version=16 -n8n_version=0.203.1 +n8n_version=0.218.0 #================================================= # PERSONAL HELPERS From f0f7e88de6d49947d90e0f31bd9aad689491ad7e Mon Sep 17 00:00:00 2001 From: Jonathan Bennetts Date: Tue, 7 Mar 2023 11:53:51 +0000 Subject: [PATCH 2/6] env tweaks to prefer user managament over basic auth --- conf/.env | 11 +++++++---- manifest.json | 8 -------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/conf/.env b/conf/.env index d7d91a1..65dc48e 100644 --- a/conf/.env +++ b/conf/.env @@ -1,10 +1,8 @@ # Folder where data should be saved N8N_USER_FOLDER=__DATADIR__ -# Authentication - IMPORTANT ALWAYS CHANGE! -N8N_BASIC_AUTH_ACTIVE=true -N8N_BASIC_AUTH_USER=__ADMIN__ -N8N_BASIC_AUTH_PASSWORD="__PASSWORD__" +# Disable Basic Auth in favour of User Management +N8N_BASIC_AUTH_ACTIVE=false # The path n8n is deployed to. N8N_PATH=__PATH__/ @@ -21,6 +19,10 @@ TZ=__TIMEZONE__ N8N_PROTOCOL=http N8N_LISTEN_ADDRESS=127.0.0.1 +# Use filesystem for binary data and keep it for 2 hours +N8N_DEFAULT_BINARY_DATA_MODE=filesystem +N8N_PERSISTED_BINARY_DATA_TTL=120 + DB_TYPE=mysqldb DB_MYSQLDB_DATABASE=__DB_NAME__ DB_MYSQLDB_HOST="localhost" @@ -34,6 +36,7 @@ EXECUTIONS_DATA_SAVE_ON_PROGRESS=true EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS=false EXECUTIONS_DATA_PRUNE=true EXECUTIONS_DATA_MAX_AGE=168 +EXECUTIONS_DATA_PRUNE_MAX_COUNT=2000 N8N_EMAIL_MODE=smtp N8N_SMTP_HOST=localhost diff --git a/manifest.json b/manifest.json index a22cba6..20ee18f 100755 --- a/manifest.json +++ b/manifest.json @@ -37,10 +37,6 @@ "example": "/n8n", "default": "/n8n" }, - { - "name": "admin", - "type": "user" - }, { "name": "is_public", "type": "boolean", @@ -49,10 +45,6 @@ "fr": "Si cette case est cochée, n8n sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." }, "default": true - }, - { - "name": "password", - "type": "password" } ] } From 04a43c1ea7e9fcdc4eacfc2bab7fc25a20492097 Mon Sep 17 00:00:00 2001 From: Jonathan Bennetts Date: Tue, 7 Mar 2023 12:05:43 +0000 Subject: [PATCH 3/6] updates --- manifest.json | 10 +++++++++- scripts/change_url | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 20ee18f..704c441 100755 --- a/manifest.json +++ b/manifest.json @@ -37,13 +37,21 @@ "example": "/n8n", "default": "/n8n" }, + { + "name": "admin", + "type": "user", + "help": { + "en": "Users email address to use for notifications", + "fr": "Adresse e-mail des utilisateurs à utiliser pour les notifications" + } + }, { "name": "is_public", "type": "boolean", "help": { "en": "If enabled, n8n 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, n8n sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." - }, + }, "default": true } ] diff --git a/scripts/change_url b/scripts/change_url index bd7f4e2..284631f 100755 --- a/scripts/change_url +++ b/scripts/change_url @@ -34,7 +34,6 @@ db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) datadir=$(ynh_app_setting_get --app=$app --key=datadir) admin=$(ynh_app_setting_get --app=$app --key=admin) -password=$(ynh_app_setting_get --app=$app --key=password) timezone="$(cat /etc/timezone)" email=$(ynh_app_setting_get --app=$app --key=email) From b669bcde3143d0d3e4931835a99f24916b7b55c1 Mon Sep 17 00:00:00 2001 From: Jonathan Bennetts Date: Tue, 7 Mar 2023 14:28:03 +0000 Subject: [PATCH 4/6] changed to 217 --- check_process | 2 +- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/upgrade | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index 18ca00e..b433a53 100755 --- a/check_process +++ b/check_process @@ -21,4 +21,4 @@ Notification=none ;;; Upgrade options ; commit=0d34c8a15f95a3dc3b9e1d233bc03410d182628a name=#29 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=9001& + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&port=9001& diff --git a/manifest.json b/manifest.json index 704c441..30936eb 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Workflow Automation Tool. Easily automate tasks across different services", "fr": "Outil d'automatisation du flux de travail. Automatisez facilement les tâches sur différents services" }, - "version": "0.218.0~ynh1", + "version": "0.217.0~ynh1", "url": "https://n8n.io/", "upstream": { "license": "Apache-2.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 9ad0600..0f98b16 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ nodejs_version=16 -n8n_version=0.218.0 +n8n_version=0.217.0 #================================================= # PERSONAL HELPERS diff --git a/scripts/upgrade b/scripts/upgrade index 114bc0d..55baaba 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,7 +25,6 @@ db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) datadir=$(ynh_app_setting_get --app=$app --key=datadir) admin=$(ynh_app_setting_get --app=$app --key=admin) -password=$(ynh_app_setting_get --app=$app --key=password) timezone="$(cat /etc/timezone)" email=$(ynh_app_setting_get --app=$app --key=email) From f6840941e32df934b3010fdef4d186936980a451 Mon Sep 17 00:00:00 2001 From: Jonathan Bennetts Date: Tue, 7 Mar 2023 14:34:53 +0000 Subject: [PATCH 5/6] updated install --- scripts/install | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/install b/scripts/install index 83c5601..0d8085c 100755 --- a/scripts/install +++ b/scripts/install @@ -26,7 +26,6 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC -password=$YNH_APP_ARG_PASSWORD admin=$YNH_APP_ARG_ADMIN timezone="$(cat /etc/timezone)" email=$(ynh_user_get_info --username=$admin --key=mail) @@ -51,8 +50,6 @@ 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=path --value=$path_url -ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=password --value="$password" ynh_app_setting_set --app=$app --key=email --value=$email #================================================= From e30f5662c1d9b287c0e863793c033c529665e391 Mon Sep 17 00:00:00 2001 From: Jonathan Bennetts Date: Tue, 7 Mar 2023 14:48:27 +0000 Subject: [PATCH 6/6] Updated to 0.218.0 --- manifest.json | 2 +- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 30936eb..704c441 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Workflow Automation Tool. Easily automate tasks across different services", "fr": "Outil d'automatisation du flux de travail. Automatisez facilement les tâches sur différents services" }, - "version": "0.217.0~ynh1", + "version": "0.218.0~ynh1", "url": "https://n8n.io/", "upstream": { "license": "Apache-2.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 0f98b16..9ad0600 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ nodejs_version=16 -n8n_version=0.217.0 +n8n_version=0.218.0 #================================================= # PERSONAL HELPERS