From b89234114b50cb8f313e4597343bea98c8c2e240 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Thu, 10 Feb 2022 01:14:49 +0100 Subject: [PATCH 001/104] Create updater.yml --- .github/workflows/updater.yml | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml new file mode 100644 index 0000000..fb72ba0 --- /dev/null +++ b/.github/workflows/updater.yml @@ -0,0 +1,49 @@ +# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. +# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. +# This file should be enough by itself, but feel free to tune it to your needs. +# It calls updater.sh, which is where you should put the app-specific update steps. +name: Check for new upstream releases +on: + # Allow to manually trigger the workflow + workflow_dispatch: + # Run it every day at 6:00 UTC + schedule: + - cron: '0 6 * * *' +jobs: + updater: + runs-on: ubuntu-latest + steps: + - name: Fetch the source code + uses: actions/checkout@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: Run the updater script + id: run_updater + run: | + # Setting up Git user + git config --global user.name 'yunohost-bot' + git config --global user.email 'yunohost-bot@users.noreply.github.com' + # Run the updater script + /bin/bash .github/workflows/updater.sh + - name: Commit changes + id: commit + if: ${{ env.PROCEED == 'true' }} + run: | + git commit -am "Upgrade to v$VERSION" + - name: Create Pull Request + id: cpr + if: ${{ env.PROCEED == 'true' }} + uses: peter-evans/create-pull-request@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: Update to version ${{ env.VERSION }} + committer: 'yunohost-bot ' + author: 'yunohost-bot ' + signoff: false + base: testing + branch: ci-auto-update-v${{ env.VERSION }} + delete-branch: true + title: 'Upgrade to version ${{ env.VERSION }}' + body: | + Upgrade to v${{ env.VERSION }} + draft: false From de578a0678f4a259b728e1b7509c79c8c3d46363 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Thu, 10 Feb 2022 00:54:29 +0000 Subject: [PATCH 002/104] wip --- doc/DISCLAIMER.md | 21 +++++++-------------- scripts/install | 15 ++++++++------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 51b8f29..404fbec 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,15 +1,8 @@ +### After installation + +TODO + +### Limitations + * This app requites a full dedicated domain (or subdomain). -* SSO does *not* work. - -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * requiring a full dedicated domain ? - * architectures not supported ? - * not-working single-sign on or LDAP integration ? - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... - -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? +* Single Sign-On and LDAP integration does *not* work. diff --git a/scripts/install b/scripts/install index 690ced2..dd7cec7 100755 --- a/scripts/install +++ b/scripts/install @@ -128,11 +128,11 @@ ynh_script_progression --message="Building ToolJet..." --time --weight=1 pushd $final_path ynh_use_nodejs - ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install + ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install -f # Needed ? - ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --prefix plugins - ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --prefix server - ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --prefix frontend + ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --prefix plugins -f + ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --prefix server -f + ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --prefix frontend -f ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build @@ -145,11 +145,12 @@ popd #================================================= ynh_script_progression --message="Adding a configuration file..." --time --weight=1 -# FIXME: package linter don't like openssl rand... Use ynh_string_random and some dirty hack to get a hex-only string -lockbox_master_key=$(openssl rand -hex 32) +# package_linter don't like `openssl rand -hex`... +# Use ynh_string_random and some magic stuff to get a 32 bytes hex-only string +lockbox_master_key=$(ynh_string_random --length=32 | xxd -p | head -n1 | cut -c 1-32) ynh_app_setting_set --app="$app" --key=lockbox_master_key --value="$lockbox_master_key" -secret_key_base=$(openssl rand -hex 64) +secret_key_base=$(ynh_string_random --length=64 | xxd -p | head -n1 | cut -c 1-64) ynh_app_setting_set --app="$app" --key=secret_key_base --value="$secret_key_base" ynh_add_config --template=".env.example" --destination="$final_path/.env" From e442fbbe8ff95c73b9009b7f527393604a583dda Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 10 Feb 2022 00:54:36 +0000 Subject: [PATCH 003/104] Auto-update README --- README.md | 21 +++++++-------------- README_fr.md | 21 +++++++-------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 4d86949..e8c97f3 100644 --- a/README.md +++ b/README.md @@ -44,21 +44,14 @@ ToolJet is an open-source low-code framework to build and deploy internal tools ## Disclaimers / important information +### After installation + +TODO + +### Limitations + * This app requites a full dedicated domain (or subdomain). -* SSO does *not* work. - -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * requiring a full dedicated domain ? - * architectures not supported ? - * not-working single-sign on or LDAP integration ? - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... - -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? +* Single Sign-On and LDAP integration does *not* work. ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 9f55e48..b77b852 100644 --- a/README_fr.md +++ b/README_fr.md @@ -40,21 +40,14 @@ ToolJet is an open-source low-code framework to build and deploy internal tools ## Avertissements / informations importantes +### After installation + +TODO + +### Limitations + * This app requites a full dedicated domain (or subdomain). -* SSO does *not* work. - -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * requiring a full dedicated domain ? - * architectures not supported ? - * not-working single-sign on or LDAP integration ? - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... - -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? +* Single Sign-On and LDAP integration does *not* work. ## Documentations et ressources From c4c1720adf155fc01565e60ae50588d2fde20534 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sat, 12 Feb 2022 08:58:41 +0000 Subject: [PATCH 004/104] wip --- scripts/install | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index dd7cec7..9af9db2 100755 --- a/scripts/install +++ b/scripts/install @@ -127,9 +127,10 @@ ynh_script_progression --message="Building ToolJet..." --time --weight=1 pushd $final_path ynh_use_nodejs + ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install npm@7.20.0 ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install -f -# Needed ? + ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --prefix plugins -f ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --prefix server -f ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --prefix frontend -f @@ -145,7 +146,7 @@ popd #================================================= ynh_script_progression --message="Adding a configuration file..." --time --weight=1 -# package_linter don't like `openssl rand -hex`... +# package_linter don't like `openssl` rand :( # Use ynh_string_random and some magic stuff to get a 32 bytes hex-only string lockbox_master_key=$(ynh_string_random --length=32 | xxd -p | head -n1 | cut -c 1-32) ynh_app_setting_set --app="$app" --key=lockbox_master_key --value="$lockbox_master_key" From 72173a0befc3f612863e4c18322124f760724673 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sat, 12 Feb 2022 09:06:14 +0000 Subject: [PATCH 005/104] wip --- conf/systemd.service | 2 +- scripts/install | 28 +++++++++++++++++----------- scripts/upgrade | 25 ++++++++++++++++++++++++- 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index ea963b9..0852bb5 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ -Environment="__NODE_ENV_PATH__" +Environment="__YNH_NODE_LOAD_PATH__" ExecStart=__YNH_NPM_ start:prod StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit diff --git a/scripts/install b/scripts/install index 9af9db2..7114107 100755 --- a/scripts/install +++ b/scripts/install @@ -123,22 +123,18 @@ ynh_add_nginx_config #================================================= # BUILD THE APPLICATION #================================================= -ynh_script_progression --message="Building ToolJet..." --time --weight=1 +ynh_script_progression --message="Building ToolJet..." --time --weight=10 pushd $final_path ynh_use_nodejs - ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install npm@7.20.0 - ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install -f + # The version shipped by default with n does not work, there is a + # wierd dependency issue about unsupported platform and fsevent. + # See https://github.com/ToolJet/ToolJet/pull/1752 + $ynh_npm install -g npm@7.20.0 - ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --prefix plugins -f - ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --prefix server -f - ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --prefix frontend -f - - ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build - - ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run db:create - ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run db:migrate + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install -f + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build popd #================================================= @@ -159,6 +155,16 @@ ynh_add_config --template=".env.example" --destination="$final_path/.env" chmod 400 "$final_path/.env" chown $app:$app "$final_path/.env" +#================================================= +# BUILD THE DATABASE +#================================================= +ynh_script_progression --message="Building ToolJet database..." --time --weight=1 + +pushd $final_path + # Build the database once the configuration is set + ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run db:migrate +popd + #================================================= # SETUP SYSTEMD #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ed30fd7..9786a36 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -107,8 +107,21 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # SPECIFIC UPGRADE #================================================= -# ... +# BUILD THE APPLICATION #================================================= +ynh_script_progression --message="Building ToolJet..." --time --weight=10 + +pushd $final_path + ynh_use_nodejs + + # The version shipped by default with n does not work, there is a + # wierd dependency issue about unsupported platform and fsevent. + # See https://github.com/ToolJet/ToolJet/pull/1752 + $ynh_npm install -g npm@7.20.0 + + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install -f + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build +popd #================================================= # UPDATE A CONFIG FILE @@ -120,6 +133,16 @@ ynh_add_config --template=".env.example" --destination="$final_path/.env" chmod 400 "$final_path/.env" chown $app:$app "$final_path/.env" +#================================================= +# BUILD THE DATABASE +#================================================= +ynh_script_progression --message="Building ToolJet database..." --time --weight=1 + +pushd $final_path + # Build the database once the configuration is set + ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run db:migrate +popd + #================================================= # SETUP SYSTEMD #================================================= From d3ac96dad5caa67586f8a52243d5cc4eab19bc7d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 18 Feb 2022 06:19:49 +0000 Subject: [PATCH 006/104] Upgrade to v1.1.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 3789725..948a2f7 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.0.tar.gz -SOURCE_SUM=1c9d520698173de6bccdb810022ebe4a1fcf1bd6acf48afa615631daa7b9aa67 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.1.0.tar.gz +SOURCE_SUM=f0b290085c6d29bdefd7211a056f06269def20752c3b955448cb9a9e704010ab SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index d82f1f8..0155aa1 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.0~ynh1", + "version": "1.1.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From bedacb6e73833a84783aeb701b0a15c7f686ce50 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 18 Feb 2022 06:19:53 +0000 Subject: [PATCH 007/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e8c97f3..ee6d199 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.0~ynh1 +**Shipped version:** 1.1.0~ynh1 diff --git a/README_fr.md b/README_fr.md index b77b852..3a7d462 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.0~ynh1 +**Version incluse :** 1.1.0~ynh1 From 8116b1ed588f5f0707604cd6fd08cbaa089e804a Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Fri, 18 Feb 2022 13:37:36 +0000 Subject: [PATCH 008/104] wip --- scripts/restore | 7 ++++++- scripts/upgrade | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 3e0b50e..52a997b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -29,7 +29,8 @@ ynh_script_progression --message="Loading installation settings..." --time --wei app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url="/" +path_url=$(ynh_app_setting_get --app=$app --key=path) +port=$(ynh_app_setting_get --app=$app --key=port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name @@ -42,6 +43,10 @@ ynh_script_progression --message="Validating restoration parameters..." --time - test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " +# FIXME: Choose another port instead of dying... +ynh_port_available --port=$port \ + || ynh_die --message="Port $port is needs to be available for this app" + #================================================= # STANDARD RESTORATION STEPS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 9786a36..c9e4fde 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,8 +17,9 @@ ynh_script_progression --message="Loading installation settings..." --time --wei app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url="/" +path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +port=$(ynh_app_setting_get --app=$app --key=port) db_name=$(ynh_app_setting_get --app=$app --key=db_name) lockbox_master_key=$(ynh_app_setting_get --app=$app --key=lockbox_master_key) secret_key_base=$(ynh_app_setting_get --app=$app --key=secret_key_base) From 1db70a2bbee413064176be9348b413e8bacf6bb9 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Thu, 24 Feb 2022 16:10:00 +0000 Subject: [PATCH 009/104] wip --- scripts/restore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/restore b/scripts/restore index 52a997b..cabafad 100755 --- a/scripts/restore +++ b/scripts/restore @@ -43,9 +43,10 @@ ynh_script_progression --message="Validating restoration parameters..." --time - test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " -# FIXME: Choose another port instead of dying... -ynh_port_available --port=$port \ - || ynh_die --message="Port $port is needs to be available for this app" +#ynh_port_available --port=$port \ +# || ynh_die --message="Port $port is needs to be available for this app" +# FIXME: I had to comment this, because somehow in package_check 9085 still in +# in use after removal/before restore ? #================================================= # STANDARD RESTORATION STEPS From 7913ea7523ba9c61ad87df1818388fb176a31229 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Thu, 24 Feb 2022 16:44:39 +0000 Subject: [PATCH 010/104] wip --- scripts/change_url | 21 ++++++++++++++------- scripts/upgrade | 2 ++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 80df9ca..4919905 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -26,13 +26,14 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Loading installation settings..." --time --weight=1 -# Needed for helper "ynh_add_nginx_config" +# Needed for .env and nginx.conf final_path=$(ynh_app_setting_get --app=$app --key=final_path) - -# Add settings here as needed by your application -#db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#db_user=$db_name -#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) +port=$(ynh_app_setting_get --app=$app --key=port) +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) +lockbox_master_key=$(ynh_app_setting_get --app=$app --key=lockbox_master_key) +secret_key_base=$(ynh_app_setting_get --app=$app --key=secret_key_base) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP @@ -108,8 +109,14 @@ fi #================================================= # SPECIFIC MODIFICATIONS #================================================= -# ... +# UPDATE A CONFIG FILE #================================================= +ynh_script_progression --message="Updating a configuration file..." --time --weight=1 + +ynh_add_config --template=".env.example" --destination="$final_path/.env" + +chmod 400 "$final_path/.env" +chown $app:$app "$final_path/.env" #================================================= # GENERIC FINALISATION diff --git a/scripts/upgrade b/scripts/upgrade index c9e4fde..aa08191 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,6 +21,8 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) 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) lockbox_master_key=$(ynh_app_setting_get --app=$app --key=lockbox_master_key) secret_key_base=$(ynh_app_setting_get --app=$app --key=secret_key_base) From 811535353ba4a313fb99af8c876dfa4e348b2b2e Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Thu, 24 Feb 2022 18:35:11 +0000 Subject: [PATCH 011/104] zblerg --- scripts/change_url | 1 + scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/change_url b/scripts/change_url index 4919905..a844731 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -29,6 +29,7 @@ ynh_script_progression --message="Loading installation settings..." --time --wei # Needed for .env and nginx.conf final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) +domain=$(ynh_app_setting_get --app=$app --key=domain) 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) diff --git a/scripts/upgrade b/scripts/upgrade index aa08191..aef2d4f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=db_name +db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) lockbox_master_key=$(ynh_app_setting_get --app=$app --key=lockbox_master_key) secret_key_base=$(ynh_app_setting_get --app=$app --key=secret_key_base) From 60d360b4ab247935e93bbd4518853408cd231661 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 25 Feb 2022 14:49:58 +0000 Subject: [PATCH 012/104] Upgrade to v1.2.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 948a2f7..fb2ed57 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.1.0.tar.gz -SOURCE_SUM=f0b290085c6d29bdefd7211a056f06269def20752c3b955448cb9a9e704010ab +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.2.1.tar.gz +SOURCE_SUM=915c29830c6e5678c291ab72d3f3b65220f084ad162c9ea24845055aad295e50 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 0155aa1..0ad710b 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.1.0~ynh1", + "version": "1.2.1~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 6a5ee51e50d7d6213e842363b38e8b1ac5cd49b0 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 25 Feb 2022 14:50:03 +0000 Subject: [PATCH 013/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ee6d199..31284a8 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.1.0~ynh1 +**Shipped version:** 1.2.1~ynh1 diff --git a/README_fr.md b/README_fr.md index 3a7d462..f7a1eae 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.1.0~ynh1 +**Version incluse :** 1.2.1~ynh1 From 394b1b47515d5d9da8261448ad40fc81ef58611d Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 27 Feb 2022 19:19:24 +0000 Subject: [PATCH 014/104] linter: Remove --time --- scripts/change_url | 16 ++++++++-------- scripts/install | 42 +++++++++++++++++------------------------- scripts/remove | 18 +++++++++--------- scripts/restore | 24 ++++++++++++------------ scripts/upgrade | 32 ++++++++++++++++---------------- 5 files changed, 62 insertions(+), 70 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index a844731..cfd5dd4 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for .env and nginx.conf final_path=$(ynh_app_setting_get --app=$app --key=final_path) @@ -39,7 +39,7 @@ secret_key_base=$(ynh_app_setting_get --app=$app --key=secret_key_base) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -74,14 +74,14 @@ fi #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --time --weight=1 +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" #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -112,7 +112,7 @@ fi #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a configuration file..." --time --weight=1 +ynh_script_progression --message="Updating a configuration file..." --weight=1 ynh_add_config --template=".env.example" --destination="$final_path/.env" @@ -124,14 +124,14 @@ chown $app:$app "$final_path/.env" #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -139,4 +139,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --time --last +ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/install b/scripts/install index 7114107..7556c4e 100755 --- a/scripts/install +++ b/scripts/install @@ -33,15 +33,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -### About --weight and --time -### ynh_script_progression will show to your final users the progression of each scripts. -### In order to do that, --weight will represent the relative time of execution compared to the other steps in the script. -### --time is a packager option, it will show you the execution time since the previous call. -### This option should be removed before releasing your app. -### Use the execution time, given by --time, to estimate the weight of a step. -### A common way to do it is to set a weight equal to the execution time in second +1. -### The execution time is given for the duration since the previous call. So the weight should be applied to this previous call. -ynh_script_progression --message="Validating installation parameters..." --time --weight=1 +ynh_script_progression --message="Validating installation parameters..." --weight=1 ### If the app uses NGINX as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app". ### If the app provides an internal web server (or uses another application server such as uWSGI), the final path should be "/opt/yunohost/$app" @@ -54,7 +46,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --time --weight=1 +ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url @@ -64,7 +56,7 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Finding an available port..." --time --weight=1 +ynh_script_progression --message="Finding an available port..." --weight=1 # Find an available port port=$(ynh_find_port --port=8095) ynh_app_setting_set --app=$app --key=port --value=$port @@ -72,7 +64,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --time --weight=1 +ynh_script_progression --message="Installing dependencies..." --weight=1 ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION @@ -80,7 +72,7 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Configuring system user..." --time --weight=1 +ynh_script_progression --message="Configuring system user..." --weight=1 # Create a system user ynh_system_user_create --username=$app --home_dir="$final_path" @@ -88,7 +80,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # CREATE A POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Creating a PostgreSQL database..." --time --weight=1 +ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1 ynh_psql_test_if_first_run @@ -100,7 +92,7 @@ ynh_psql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --time --weight=1 +ynh_script_progression --message="Setting up source files..." --weight=1 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src @@ -113,7 +105,7 @@ chown -R $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --time --weight=1 +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config @@ -123,7 +115,7 @@ ynh_add_nginx_config #================================================= # BUILD THE APPLICATION #================================================= -ynh_script_progression --message="Building ToolJet..." --time --weight=10 +ynh_script_progression --message="Building ToolJet..." --weight=10 pushd $final_path ynh_use_nodejs @@ -140,7 +132,7 @@ popd #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --time --weight=1 +ynh_script_progression --message="Adding a configuration file..." --weight=1 # package_linter don't like `openssl` rand :( # Use ynh_string_random and some magic stuff to get a 32 bytes hex-only string @@ -158,7 +150,7 @@ chown $app:$app "$final_path/.env" #================================================= # BUILD THE DATABASE #================================================= -ynh_script_progression --message="Building ToolJet database..." --time --weight=1 +ynh_script_progression --message="Building ToolJet database..." --weight=1 pushd $final_path # Build the database once the configuration is set @@ -168,7 +160,7 @@ popd #================================================= # SETUP SYSTEMD #================================================= -ynh_script_progression --message="Configuring a systemd service..." --time --weight=1 +ynh_script_progression --message="Configuring a systemd service..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config @@ -178,14 +170,14 @@ ynh_add_systemd_config #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add $app #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" @@ -193,7 +185,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." --time --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] @@ -206,7 +198,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -214,4 +206,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --time --last +ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/remove b/scripts/remove index 68a477b..ed2edfd 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -31,14 +31,14 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing $app service integration..." --time --weight=1 + ynh_script_progression --message="Removing $app service integration..." --weight=1 yunohost service remove $app fi #================================================= # STOP AND REMOVE SERVICE #================================================= -ynh_script_progression --message="Stopping and removing the systemd service..." --time --weight=1 +ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1 # Remove the dedicated systemd config ynh_remove_systemd_config @@ -46,7 +46,7 @@ ynh_remove_systemd_config #================================================= # REMOVE THE POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Removing the PostgreSQL database..." --time --weight=1 +ynh_script_progression --message="Removing the PostgreSQL database..." --weight=1 # Remove a database if it exists, along with the associated user ynh_psql_remove_db --db_user=$db_user --db_name=$db_name @@ -54,7 +54,7 @@ ynh_psql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --time --weight=1 +ynh_script_progression --message="Removing app main directory..." --weight=1 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -62,7 +62,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config @@ -70,7 +70,7 @@ ynh_remove_nginx_config #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --time --weight=1 +ynh_script_progression --message="Removing dependencies..." --weight=1 # Remove metapackage and its dependencies ynh_remove_app_dependencies @@ -87,7 +87,7 @@ ynh_remove_nodejs #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1 +ynh_script_progression --message="Removing the dedicated system user..." --weight=1 # Delete a system user ynh_system_user_delete --username=$app @@ -96,4 +96,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --time --last +ynh_script_progression --message="Removal of $app completed" --last diff --git a/scripts/restore b/scripts/restore index cabafad..2cc3cd1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -24,7 +24,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -38,7 +38,7 @@ db_user=$db_name #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_script_progression --message="Validating restoration parameters..." --time --weight=1 +ynh_script_progression --message="Validating restoration parameters..." --weight=1 test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -53,14 +53,14 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RECREATE THE DEDICATED USER #================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --time --weight=1 +ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 # Create the dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" @@ -68,7 +68,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --time --weight=1 +ynh_script_progression --message="Restoring the app main directory..." --weight=1 ynh_restore_file --origin_path="$final_path" @@ -81,7 +81,7 @@ chown -R $app:www-data "$final_path" #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --time --weight=1 +ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies @@ -90,7 +90,7 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION #================================================= # RESTORE THE POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Restoring the PostgreSQL database..." --time --weight=1 +ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1 db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd @@ -99,7 +99,7 @@ ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./d #================================================= # RESTORE SYSTEMD #================================================= -ynh_script_progression --message="Restoring the systemd configuration..." --time --weight=1 +ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet @@ -107,14 +107,14 @@ systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add $app #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" @@ -123,7 +123,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -131,4 +131,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --time --last +ynh_script_progression --message="Restoration completed for $app" --last diff --git a/scripts/upgrade b/scripts/upgrade index aef2d4f..992b406 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -41,7 +41,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -57,21 +57,21 @@ ynh_abort_if_errors #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --time --weight=1 +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" #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -#ynh_script_progression --message="Ensuring downward compatibility..." --time --weight=1 +#ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # Nothing to do yet... #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --time --weight=1 +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" @@ -82,7 +82,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --time --weight=1 + ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" @@ -95,7 +95,7 @@ chown -R $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config @@ -103,7 +103,7 @@ ynh_add_nginx_config #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --time --weight=1 +ynh_script_progression --message="Upgrading dependencies..." --weight=1 ynh_install_app_dependencies $pkg_dependencies @@ -112,7 +112,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # BUILD THE APPLICATION #================================================= -ynh_script_progression --message="Building ToolJet..." --time --weight=10 +ynh_script_progression --message="Building ToolJet..." --weight=10 pushd $final_path ynh_use_nodejs @@ -129,7 +129,7 @@ popd #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a configuration file..." --time --weight=1 +ynh_script_progression --message="Updating a configuration file..." --weight=1 ynh_add_config --template=".env.example" --destination="$final_path/.env" @@ -139,7 +139,7 @@ chown $app:$app "$final_path/.env" #================================================= # BUILD THE DATABASE #================================================= -ynh_script_progression --message="Building ToolJet database..." --time --weight=1 +ynh_script_progression --message="Building ToolJet database..." --weight=1 pushd $final_path # Build the database once the configuration is set @@ -149,7 +149,7 @@ popd #================================================= # SETUP SYSTEMD #================================================= -ynh_script_progression --message="Upgrading systemd configuration..." --time --weight=1 +ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config @@ -159,21 +159,21 @@ ynh_add_systemd_config #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add $app #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -181,4 +181,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --time --last +ynh_script_progression --message="Upgrade of $app completed" --last From 540fb80a7fb0bea5010cc671947785249c4ebc8b Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 27 Feb 2022 19:21:45 +0000 Subject: [PATCH 015/104] Require YunoHost 11 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0ad710b..80c64a0 100644 --- a/manifest.json +++ b/manifest.json @@ -18,7 +18,7 @@ "name": "Tagadda" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11" }, "multi_instance": true, "services": [ From 64b3581c090ac7ed2c2649c52c22cb82b16602c9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 9 Mar 2022 06:19:44 +0000 Subject: [PATCH 016/104] Upgrade to v1.4.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index fb2ed57..f0fc2ea 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.2.1.tar.gz -SOURCE_SUM=915c29830c6e5678c291ab72d3f3b65220f084ad162c9ea24845055aad295e50 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.4.0.tar.gz +SOURCE_SUM=c320eaa79b09a9d528df83c735906b3e4e958238b361805cb6d39db38c330f0f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 80c64a0..8a567c4 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.2.1~ynh1", + "version": "1.4.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From af62b035931e439688058424f9fe59a319efa981 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 9 Mar 2022 06:19:48 +0000 Subject: [PATCH 017/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 31284a8..ac274b6 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.2.1~ynh1 +**Shipped version:** 1.4.0~ynh1 diff --git a/README_fr.md b/README_fr.md index f7a1eae..353e910 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.2.1~ynh1 +**Version incluse :** 1.4.0~ynh1 From 9b76933d18a381ad0a7c9ba3177cf635e8104ced Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Thu, 10 Mar 2022 16:50:50 +0000 Subject: [PATCH 018/104] Revert "Require YunoHost 11" This reverts commit 540fb80a7fb0bea5010cc671947785249c4ebc8b. --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 8a567c4..d5bb896 100644 --- a/manifest.json +++ b/manifest.json @@ -18,7 +18,7 @@ "name": "Tagadda" }, "requirements": { - "yunohost": ">= 11" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ From d012a02abb903ae677209f1d0b1d7c5700b7c4e1 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 27 Feb 2022 19:21:45 +0000 Subject: [PATCH 019/104] Require YunoHost 11 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d5bb896..8a567c4 100644 --- a/manifest.json +++ b/manifest.json @@ -18,7 +18,7 @@ "name": "Tagadda" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11" }, "multi_instance": true, "services": [ From 2f83dd3e0127d3e361142ac2b101e5939977ab0c Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Thu, 10 Mar 2022 19:05:27 +0000 Subject: [PATCH 020/104] Fix systemd service --- conf/systemd.service | 2 +- sources/extra_files/app/.gitignore | 2 -- sources/patches/.gitignore | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 sources/extra_files/app/.gitignore delete mode 100644 sources/patches/.gitignore diff --git a/conf/systemd.service b/conf/systemd.service index 0852bb5..e0bdd18 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,7 +8,7 @@ User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ Environment="__YNH_NODE_LOAD_PATH__" -ExecStart=__YNH_NPM_ start:prod +ExecStart=__YNH_NPM__ start:prod StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit diff --git a/sources/extra_files/app/.gitignore b/sources/extra_files/app/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/sources/extra_files/app/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] diff --git a/sources/patches/.gitignore b/sources/patches/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/sources/patches/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] From 3c9ced66b77ffd5f543e41894f268fb7982f7e59 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Thu, 10 Mar 2022 19:33:58 +0000 Subject: [PATCH 021/104] Fix systemd --- conf/.env.example | 1 + doc/DISCLAIMER.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/.env.example b/conf/.env.example index 3afee6f..1a6352a 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -4,6 +4,7 @@ TOOLJET_HOST=http://127.0.0.1:__PORT__ LOCKBOX_MASTER_KEY=__LOCKBOX_MASTER_KEY__ SECRET_KEY_BASE=__SECRET_KEY_BASE__ +PORT=__PORT__ SERVE_CLIENT=true diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 404fbec..6b83f15 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -4,5 +4,6 @@ TODO ### Limitations -* This app requites a full dedicated domain (or subdomain). +* Require YunoHost 11. +* This app requires a full dedicated domain (or subdomain), with a signed certificate. * Single Sign-On and LDAP integration does *not* work. From fa6c277a5384ce75f0dc9a4b0127afeabd30f200 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 10 Mar 2022 19:34:10 +0000 Subject: [PATCH 022/104] Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ac274b6..737988b 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,8 @@ TODO ### Limitations -* This app requites a full dedicated domain (or subdomain). +* Require YunoHost 11. +* This app requires a full dedicated domain (or subdomain), with a signed certificate. * Single Sign-On and LDAP integration does *not* work. ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 353e910..961cad9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -46,7 +46,8 @@ TODO ### Limitations -* This app requites a full dedicated domain (or subdomain). +* Require YunoHost 11. +* This app requires a full dedicated domain (or subdomain), with a signed certificate. * Single Sign-On and LDAP integration does *not* work. ## Documentations et ressources From 39ace3cade02c886b86f33f25f6bc22d3fc294f9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 11 Mar 2022 11:43:18 +0000 Subject: [PATCH 023/104] Upgrade to v1.5.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index f0fc2ea..491b79f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.4.0.tar.gz -SOURCE_SUM=c320eaa79b09a9d528df83c735906b3e4e958238b361805cb6d39db38c330f0f +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.5.0.tar.gz +SOURCE_SUM=395543855e2652c23d7622a8e58dd2383e34623c6cdeed68b82e60f2904fe5cc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 8a567c4..eb531b3 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.4.0~ynh1", + "version": "1.5.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From c70dfca6d48a31aafaabd84fa955dfcbad6cfaf8 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 11 Mar 2022 11:43:22 +0000 Subject: [PATCH 024/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 737988b..5011a2e 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.4.0~ynh1 +**Shipped version:** 1.5.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 961cad9..7b9d2f1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.4.0~ynh1 +**Version incluse :** 1.5.0~ynh1 From b467d39475fb71a4ac7c46a3a3b1cc803d9ce968 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 18 Mar 2022 06:19:44 +0000 Subject: [PATCH 025/104] Upgrade to v1.6.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 491b79f..0395157 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.5.0.tar.gz -SOURCE_SUM=395543855e2652c23d7622a8e58dd2383e34623c6cdeed68b82e60f2904fe5cc +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.6.0.tar.gz +SOURCE_SUM=39440a3c83a27d25d31a1a6482fc40c6b0b27f53099568c94787ca11ef046fec SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index eb531b3..3f75d87 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.5.0~ynh1", + "version": "1.6.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From f0e34808d7f816eb2d8334f6ea527fc7c9fa7759 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 18 Mar 2022 06:19:48 +0000 Subject: [PATCH 026/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5011a2e..e50b4ac 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.5.0~ynh1 +**Shipped version:** 1.6.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 7b9d2f1..66279af 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.5.0~ynh1 +**Version incluse :** 1.6.0~ynh1 From ddb839dfd930a85c3bbf674c9450375290d7d60e Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Thu, 24 Mar 2022 09:38:44 +0000 Subject: [PATCH 027/104] fix --- conf/.env.example | 2 +- conf/systemd.service | 4 ++-- scripts/_common.sh | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index 1a6352a..748f4ca 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -20,7 +20,7 @@ CHECK_FOR_UPDATES=check_if_updates_are_available # EMAIL CONFIGURATION DEFAULT_FROM_EMAIL=tooljet@__DOMAIN__ -SMTP_DOMAIN=localhost +SMTP_DOMAIN=__MAIN_DOMAIN__ SMTP_PORT=25 # DISABLE USER SIGNUPS (true or false). Default: true diff --git a/conf/systemd.service b/conf/systemd.service index e0bdd18..cf78bc2 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=Small description of the service +Description=ToolJet server After=network.target [Service] @@ -8,7 +8,7 @@ User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ Environment="__YNH_NODE_LOAD_PATH__" -ExecStart=__YNH_NPM__ start:prod +ExecStart=__YNH_NPM__ run start:prod StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit diff --git a/scripts/_common.sh b/scripts/_common.sh index facb060..edbea54 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,6 +9,8 @@ pkg_dependencies="postgresql postgresql-contrib libpq-dev" NODEJS_VERSION="14" +main_domain=$(cat /etc/yunohost/current_host) + #================================================= # PERSONAL HELPERS #================================================= From 6f12cf977834c207889b825496ba1f9e96fa5580 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Thu, 24 Mar 2022 09:42:36 +0000 Subject: [PATCH 028/104] Better PR message --- .github/workflows/updater.sh | 1 + .github/workflows/updater.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index f8ad5d8..c204b3c 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -30,6 +30,7 @@ fi echo "Current version: $current_version" echo "Latest release from upstream: $version" echo "VERSION=$version" >> $GITHUB_ENV +echo "REPO=$repo" >> $GITHUB_ENV # For the time being, let's assume the script will fail echo "PROCEED=false" >> $GITHUB_ENV diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index fb72ba0..4363d38 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -46,4 +46,5 @@ jobs: title: 'Upgrade to version ${{ env.VERSION }}' body: | Upgrade to v${{ env.VERSION }} + [See upstream release page](https://github.com/${{ env.REPO }}/releases/tag/v${{ env.VERSION }}) draft: false From fcdac9631aa7ba545fd718b95aacc5993de567b0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 24 Mar 2022 09:44:44 +0000 Subject: [PATCH 029/104] Upgrade to v1.7.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 0395157..f50fdb6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.6.0.tar.gz -SOURCE_SUM=39440a3c83a27d25d31a1a6482fc40c6b0b27f53099568c94787ca11ef046fec +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.7.0.tar.gz +SOURCE_SUM=56a32f323f1659c4de458f5bc28eae3cdecebd1ccdfad5fdb8b2ae38a25bb9e6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 3f75d87..857ae1a 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.6.0~ynh1", + "version": "1.7.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 389428541bdb432607cd029554722ee79ea877de Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 24 Mar 2022 09:44:48 +0000 Subject: [PATCH 030/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e50b4ac..a1da401 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.6.0~ynh1 +**Shipped version:** 1.7.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 66279af..4740087 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.6.0~ynh1 +**Version incluse :** 1.7.0~ynh1 From 4c6722f89e4774ae6bb9d910133fc7e8b14f461f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 25 Mar 2022 06:20:52 +0000 Subject: [PATCH 031/104] Upgrade to v1.8.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index f50fdb6..a8fc773 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.7.0.tar.gz -SOURCE_SUM=56a32f323f1659c4de458f5bc28eae3cdecebd1ccdfad5fdb8b2ae38a25bb9e6 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.8.0.tar.gz +SOURCE_SUM=bee01bc92bed0b79b05a047bd0a41b068d262758f18a69c28b8940d9e0b0eab6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 857ae1a..0696c39 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.7.0~ynh1", + "version": "1.8.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 62e3652631fbcf3309d522ffc867e1b0f0a095b3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 25 Mar 2022 06:20:56 +0000 Subject: [PATCH 032/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a1da401..29650e4 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.7.0~ynh1 +**Shipped version:** 1.8.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 4740087..206c9c5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.7.0~ynh1 +**Version incluse :** 1.8.0~ynh1 From 1a44a6479cbb06f05596bb56decbc42e846f7ec0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 31 Mar 2022 06:20:33 +0000 Subject: [PATCH 033/104] Upgrade to v1.9.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index a8fc773..10fa291 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.8.0.tar.gz -SOURCE_SUM=bee01bc92bed0b79b05a047bd0a41b068d262758f18a69c28b8940d9e0b0eab6 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.9.0.tar.gz +SOURCE_SUM=b847a9823d65b96814453425bd296896a22ad17d972a9a7f9b4ae41ec4555b0c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 0696c39..5cc9cb3 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.8.0~ynh1", + "version": "1.9.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 0a016a664771a92da7313545c074dfd6b8050c96 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 31 Mar 2022 06:20:37 +0000 Subject: [PATCH 034/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 29650e4..36c0a30 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.8.0~ynh1 +**Shipped version:** 1.9.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 206c9c5..08410df 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.8.0~ynh1 +**Version incluse :** 1.9.0~ynh1 From 038318da8937ad8d2ec06fa6fcc8adda2df433b0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 12 Apr 2022 06:20:58 +0000 Subject: [PATCH 035/104] Upgrade to v1.10.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 10fa291..dfe16b7 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.9.0.tar.gz -SOURCE_SUM=b847a9823d65b96814453425bd296896a22ad17d972a9a7f9b4ae41ec4555b0c +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.10.0.tar.gz +SOURCE_SUM=e7d70c5ca315efdb74e7e5257aa974976c5d39095309b59097df6e822d0d1987 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 5cc9cb3..971619f 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.9.0~ynh1", + "version": "1.10.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From f4634860e146ee4849d0f4fc8d1113a8860d7beb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 12 Apr 2022 06:21:01 +0000 Subject: [PATCH 036/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 36c0a30..ad39171 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.9.0~ynh1 +**Shipped version:** 1.10.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 08410df..d535864 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.9.0~ynh1 +**Version incluse :** 1.10.0~ynh1 From c3e2b685c94830e3a785ef661def34ff173fa710 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 29 Apr 2022 06:22:07 +0000 Subject: [PATCH 037/104] Upgrade to v1.11.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index dfe16b7..7e92a55 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.10.0.tar.gz -SOURCE_SUM=e7d70c5ca315efdb74e7e5257aa974976c5d39095309b59097df6e822d0d1987 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.11.0.tar.gz +SOURCE_SUM=cc9f714a07d66ab3199d80db91c2e48c1a4ddd41c9f477cb482ff804b1eebffa SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 971619f..0b2fdef 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.10.0~ynh1", + "version": "1.11.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 1243ae37e800e41277a51c6e6308e03663fac0a8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 29 Apr 2022 06:22:11 +0000 Subject: [PATCH 038/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ad39171..ea512a0 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.10.0~ynh1 +**Shipped version:** 1.11.0~ynh1 diff --git a/README_fr.md b/README_fr.md index d535864..de83ceb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.10.0~ynh1 +**Version incluse :** 1.11.0~ynh1 From 0eae53bc685a846f9fc52d5a9e641807d205cff7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 5 May 2022 06:22:39 +0000 Subject: [PATCH 039/104] Upgrade to v1.12.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 7e92a55..3809647 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.11.0.tar.gz -SOURCE_SUM=cc9f714a07d66ab3199d80db91c2e48c1a4ddd41c9f477cb482ff804b1eebffa +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.12.1.tar.gz +SOURCE_SUM=976fa9da609159b41925f428da5a45e868eab76a76b74968036f639268327273 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 0b2fdef..7889e5b 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.11.0~ynh1", + "version": "1.12.1~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 270bf05e53b6b0b840eaf308eeda76f9a1c89ace Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 5 May 2022 06:22:43 +0000 Subject: [PATCH 040/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ea512a0..0e31d82 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.11.0~ynh1 +**Shipped version:** 1.12.1~ynh1 diff --git a/README_fr.md b/README_fr.md index de83ceb..1a3b683 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.11.0~ynh1 +**Version incluse :** 1.12.1~ynh1 From fa036ca40e795ce2549fa4e88253fe64c0a42441 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 12 May 2022 06:24:05 +0000 Subject: [PATCH 041/104] Upgrade to v1.13.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 3809647..0fc7d45 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.12.1.tar.gz -SOURCE_SUM=976fa9da609159b41925f428da5a45e868eab76a76b74968036f639268327273 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.13.0.tar.gz +SOURCE_SUM=873ae9e79a5cf092c4e68b306a4e3390376f50d1340357ce1c67ac2381adb969 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 7889e5b..be66145 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.12.1~ynh1", + "version": "1.13.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From e6b9d4debb508b54eb4a0ad4c5c5e27c5dac21d8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 12 May 2022 06:24:09 +0000 Subject: [PATCH 042/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0e31d82..c0ddfba 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.12.1~ynh1 +**Shipped version:** 1.13.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 1a3b683..3ea1893 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.12.1~ynh1 +**Version incluse :** 1.13.0~ynh1 From 537d712d50014d265f54d0c8e399cb81c0df0c13 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 17 Jun 2022 06:21:25 +0000 Subject: [PATCH 043/104] Upgrade to v1.18.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 0fc7d45..103ddf4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.13.0.tar.gz -SOURCE_SUM=873ae9e79a5cf092c4e68b306a4e3390376f50d1340357ce1c67ac2381adb969 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.18.0.tar.gz +SOURCE_SUM=a44a649b90c436f3cb32002f6f32eee8255c00aa7f9f671143dc63ed3720dc7a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index be66145..07c1122 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.13.0~ynh1", + "version": "1.18.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 7db18b95257cf7653466ace3e9972d33e5df931e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 17 Jun 2022 06:21:28 +0000 Subject: [PATCH 044/104] Auto-update README --- README.md | 23 +++++++++++------------ README_fr.md | 29 ++++++++++++++++------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index c0ddfba..95843af 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # ToolJet for YunoHost -[![Integration level](https://dash.yunohost.org/integration/tooljet.svg)](https://dash.yunohost.org/appci/app/tooljet) ![](https://ci-apps.yunohost.org/ci/badges/tooljet.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/tooljet.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/tooljet.svg)](https://dash.yunohost.org/appci/app/tooljet) ![Working status](https://ci-apps.yunohost.org/ci/badges/tooljet.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/tooljet.maintain.svg) [![Install ToolJet with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tooljet) *[Lire ce readme en français.](./README_fr.md)* @@ -34,13 +34,11 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.13.0~ynh1 - - +**Shipped version:** 1.18.0~ynh1 ## Screenshots -![](./doc/screenshots/example.png) +![Screenshot of ToolJet](./doc/screenshots/example.png) ## Disclaimers / important information @@ -56,21 +54,22 @@ TODO ## Documentation and resources -* Official app website: https://tooljet.com/ -* Official user documentation: https://docs.tooljet.com/docs/intro -* Upstream app code repository: https://github.com/ToolJet/ToolJet -* YunoHost documentation for this app: https://yunohost.org/app_tooljet -* Report a bug: https://github.com/YunoHost-Apps/tooljet_ynh/issues +* Official app website: +* Official user documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/tooljet_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/tooljet_ynh/tree/testing --debug or sudo yunohost app upgrade tooljet -u https://github.com/YunoHost-Apps/tooljet_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 3ea1893..e4f5001 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # ToolJet pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/tooljet.svg)](https://dash.yunohost.org/appci/app/tooljet) ![](https://ci-apps.yunohost.org/ci/badges/tooljet.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/tooljet.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/tooljet.svg)](https://dash.yunohost.org/appci/app/tooljet) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/tooljet.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/tooljet.maintain.svg) [![Installer ToolJet avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tooljet) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer ToolJet rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -30,13 +34,11 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.13.0~ynh1 - - +**Version incluse :** 1.18.0~ynh1 ## Captures d'écran -![](./doc/screenshots/example.png) +![Capture d'écran de ToolJet](./doc/screenshots/example.png) ## Avertissements / informations importantes @@ -52,21 +54,22 @@ TODO ## Documentations et ressources -* Site officiel de l'app : https://tooljet.com/ -* Documentation officielle utilisateur : https://docs.tooljet.com/docs/intro -* Dépôt de code officiel de l'app : https://github.com/ToolJet/ToolJet -* Documentation YunoHost pour cette app : https://yunohost.org/app_tooljet -* Signaler un bug : https://github.com/YunoHost-Apps/tooljet_ynh/issues +* Site officiel de l'app : +* Documentation officielle utilisateur : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/tooljet_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/tooljet_ynh/tree/testing --debug ou sudo yunohost app upgrade tooljet -u https://github.com/YunoHost-Apps/tooljet_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 65493ae0ec83f55c4beb8210281f2136e477636f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 17 Aug 2022 06:24:14 +0000 Subject: [PATCH 045/104] Upgrade to v1.22.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 103ddf4..acb26cb 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.18.0.tar.gz -SOURCE_SUM=a44a649b90c436f3cb32002f6f32eee8255c00aa7f9f671143dc63ed3720dc7a +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.22.0.tar.gz +SOURCE_SUM=2bd1d9960668d740190f474abd7690662f37875f20ee0f2293232e35a98f26f0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 07c1122..fd4613c 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.18.0~ynh1", + "version": "1.22.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 982085e839a294c5e3f92472b7c8fa9606496da6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 17 Aug 2022 06:24:18 +0000 Subject: [PATCH 046/104] Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 95843af..c3e535b 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,8 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.18.0~ynh1 +**Shipped version:** 1.22.0~ynh1 + ## Screenshots diff --git a/README_fr.md b/README_fr.md index e4f5001..70cf930 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,8 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.18.0~ynh1 +**Version incluse :** 1.22.0~ynh1 + ## Captures d'écran From 56a6f5b137dc8a82f1dc2c175dca895e4681a800 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 18 Aug 2022 11:11:49 +0200 Subject: [PATCH 047/104] Fix double license key in manifest --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index fd4613c..76aa9f2 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,7 @@ "userdoc": "https://docs.tooljet.com/docs/intro", "code": "https://github.com/ToolJet/ToolJet" }, - "license": "GPL-3.0", + "license": "AGPL-3.0", "maintainer": { "name": "Tagadda" }, From 341ddb48631319f43b15274a2dafc0cbdf873d1b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 2 Sep 2022 06:39:31 +0000 Subject: [PATCH 048/104] Upgrade to v1.24.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index acb26cb..ba60aa2 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.22.0.tar.gz -SOURCE_SUM=2bd1d9960668d740190f474abd7690662f37875f20ee0f2293232e35a98f26f0 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.24.0.tar.gz +SOURCE_SUM=3875f5887d06d4f38f88de25c21fcfc444104235a19fe8b8a072dee6db496ae5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 76aa9f2..b720ed8 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.22.0~ynh1", + "version": "1.24.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 6378f99f52693708040cf81b969d009ed8c5e45c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 2 Sep 2022 06:39:35 +0000 Subject: [PATCH 049/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c3e535b..99f6d1e 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.22.0~ynh1 +**Shipped version:** 1.24.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 70cf930..f7d9eed 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.22.0~ynh1 +**Version incluse :** 1.24.0~ynh1 ## Captures d'écran From b897e6550adc51de49cbdf94acd27fc1435261d8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 16 Sep 2022 06:47:59 +0000 Subject: [PATCH 050/104] Upgrade to v1.25.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index ba60aa2..812522a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.24.0.tar.gz -SOURCE_SUM=3875f5887d06d4f38f88de25c21fcfc444104235a19fe8b8a072dee6db496ae5 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.25.0.tar.gz +SOURCE_SUM=6fb37b9b3f871b6737146a3d9f67076e3448d2bfc3a529d8fa63a03119509eb0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index b720ed8..5dbdd4d 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.24.0~ynh1", + "version": "1.25.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 1ca509f3f15216fbf249eaf61326f0bf1fe5d1c5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 16 Sep 2022 06:48:03 +0000 Subject: [PATCH 051/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 99f6d1e..ae1beb7 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.24.0~ynh1 +**Shipped version:** 1.25.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index f7d9eed..0c35a51 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.24.0~ynh1 +**Version incluse :** 1.25.0~ynh1 ## Captures d'écran From d8965b2db78ce488cf6f23f27d9dfecf3d299fa0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 27 Sep 2022 06:51:05 +0000 Subject: [PATCH 052/104] Upgrade to v1.26.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 812522a..712d1c1 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.25.0.tar.gz -SOURCE_SUM=6fb37b9b3f871b6737146a3d9f67076e3448d2bfc3a529d8fa63a03119509eb0 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.26.0.tar.gz +SOURCE_SUM=9d13dc0271d33f153d4fb766a592627022a04632c2567a15335657d41e7f0bee SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 5dbdd4d..4e2a79c 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.25.0~ynh1", + "version": "1.26.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 9c21b46909046a4e0144714a6d5e78f749ab6640 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 27 Sep 2022 06:51:10 +0000 Subject: [PATCH 053/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ae1beb7..907e426 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.25.0~ynh1 +**Shipped version:** 1.26.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 0c35a51..9e08dc2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.25.0~ynh1 +**Version incluse :** 1.26.0~ynh1 ## Captures d'écran From 23a127e71692d71fde1385070fe6b475346070fe Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 30 Oct 2022 10:46:40 +0000 Subject: [PATCH 054/104] Auto-update README --- README.md | 1 - README_fr.md | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 907e426..fff8796 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,6 @@ ToolJet is an open-source low-code framework to build and deploy internal tools **Shipped version:** 1.26.0~ynh1 - ## Screenshots ![Screenshot of ToolJet](./doc/screenshots/example.png) diff --git a/README_fr.md b/README_fr.md index 9e08dc2..9f86630 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,8 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.26.0~ynh1 - +**Version incluse :** 1.26.0~ynh1 ## Captures d'écran From 051cc6f164240fcb16af18d9e00566afb39cff69 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 30 Oct 2022 10:49:50 +0000 Subject: [PATCH 055/104] Upgrade to v1.28.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 712d1c1..067f6c1 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.26.0.tar.gz -SOURCE_SUM=9d13dc0271d33f153d4fb766a592627022a04632c2567a15335657d41e7f0bee +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.28.0.tar.gz +SOURCE_SUM=dea68fa8a4ca314cdb9addae38990e1126b918bfbb7cbfee124e6599b32de400 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 4e2a79c..46fea20 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.26.0~ynh1", + "version": "1.28.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 354ce1fb7b79ff83dc2d56d5906b2796c356ba9e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 30 Oct 2022 10:49:54 +0000 Subject: [PATCH 056/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fff8796..7f9580b 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.26.0~ynh1 +**Shipped version:** 1.28.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 9f86630..40ca473 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.26.0~ynh1 +**Version incluse :** 1.28.0~ynh1 ## Captures d'écran From 782d37014d2598c2e6ca0156dd229ccb6018596d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 23 Nov 2022 06:25:41 +0000 Subject: [PATCH 057/104] Upgrade to v1.29.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 067f6c1..d96b582 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.28.0.tar.gz -SOURCE_SUM=dea68fa8a4ca314cdb9addae38990e1126b918bfbb7cbfee124e6599b32de400 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.29.1.tar.gz +SOURCE_SUM=d18b2d1a0f5b08ed758fc43531810544e03870508539898cb2d766e52cc1d730 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 46fea20..30a8c04 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.28.0~ynh1", + "version": "1.29.1~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 058e889288a849a8888211f564c9730af2346253 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 27 Nov 2022 07:02:04 +0000 Subject: [PATCH 058/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7f9580b..d8db4de 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.28.0~ynh1 +**Shipped version:** 1.29.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 40ca473..e803df8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.28.0~ynh1 +**Version incluse :** 1.29.1~ynh1 ## Captures d'écran From 54facb12957532c98017bbe090cd2baa0b42bcc9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 28 Dec 2022 06:23:34 +0000 Subject: [PATCH 059/104] Upgrade to v1.31.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index d96b582..f0bae79 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.29.1.tar.gz -SOURCE_SUM=d18b2d1a0f5b08ed758fc43531810544e03870508539898cb2d766e52cc1d730 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.31.0.tar.gz +SOURCE_SUM=e3cf33c6af1e9a25ac0c4a62de2a4b017fc4cb7c99758f00f76882558c024d44 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 30a8c04..1702015 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.29.1~ynh1", + "version": "1.31.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 057789519996927a681d4baa9d35a2fa0d362bd8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 28 Dec 2022 06:23:38 +0000 Subject: [PATCH 060/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d8db4de..a697f45 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.29.1~ynh1 +**Shipped version:** 1.31.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index e803df8..7aab5bc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.29.1~ynh1 +**Version incluse :** 1.31.0~ynh1 ## Captures d'écran From fe226d0c6b414371267bc2c3439490d8af4168b7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 8 Jan 2023 06:22:09 +0000 Subject: [PATCH 061/104] Upgrade to v1.31.2 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index f0bae79..7067b60 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.31.0.tar.gz -SOURCE_SUM=e3cf33c6af1e9a25ac0c4a62de2a4b017fc4cb7c99758f00f76882558c024d44 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.31.2.tar.gz +SOURCE_SUM=49a3a01f3f53aab218237c033380c44c6c44cffcb161bd032bb5fdad0b62f1cf SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 1702015..5a89122 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.31.0~ynh1", + "version": "1.31.2~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 75c26a181ed88b62a5f01db6f837d8f4d670907b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 8 Jan 2023 06:22:13 +0000 Subject: [PATCH 062/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a697f45..071d96e 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.31.0~ynh1 +**Shipped version:** 1.31.2~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 7aab5bc..50ec8b5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.31.0~ynh1 +**Version incluse :** 1.31.2~ynh1 ## Captures d'écran From 0075d4f03501a6f9bf487af2dcb9cd0ac0599b09 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 24 Feb 2023 00:34:25 +0100 Subject: [PATCH 063/104] [autopatch] Upgrade auto-updater --- .github/workflows/updater.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 4363d38..4a866ff 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} From d7e5c0a33083ab6a347dcfae36e95a343616cc95 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 23 Feb 2023 23:34:26 +0000 Subject: [PATCH 064/104] Auto-update README --- README.md | 3 ++- README_fr.md | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 071d96e..f6bf00e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # ToolJet for YunoHost -[![Integration level](https://dash.yunohost.org/integration/tooljet.svg)](https://dash.yunohost.org/appci/app/tooljet) ![Working status](https://ci-apps.yunohost.org/ci/badges/tooljet.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/tooljet.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/tooljet.svg)](https://dash.yunohost.org/appci/app/tooljet) ![Working status](https://ci-apps.yunohost.org/ci/badges/tooljet.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/tooljet.maintain.svg) + [![Install ToolJet with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tooljet) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 50ec8b5..ab2ce09 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # ToolJet pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/tooljet.svg)](https://dash.yunohost.org/appci/app/tooljet) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/tooljet.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/tooljet.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/tooljet.svg)](https://dash.yunohost.org/appci/app/tooljet) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/tooljet.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/tooljet.maintain.svg) + [![Installer ToolJet avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tooljet) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer ToolJet rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer ToolJet rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble ToolJet is an open-source low-code framework to build and deploy internal tools quickly without much effort from the engineering teams. You can connect to your data sources, such as databases (like PostgreSQL, MongoDB, Elasticsearch, etc), API endpoints (ToolJet supports importing OpenAPI spec & OAuth2 authorization), and external services (like Stripe, Slack, Google Sheets, Airtable) and use our pre-built UI widgets to build internal tools. @@ -36,9 +37,9 @@ ToolJet is an open-source low-code framework to build and deploy internal tools **Version incluse :** 1.31.2~ynh1 -## Captures d'écran +## Captures d’écran -![Capture d'écran de ToolJet](./doc/screenshots/example.png) +![Capture d’écran de ToolJet](./doc/screenshots/example.png) ## Avertissements / informations importantes @@ -54,9 +55,9 @@ TODO ## Documentations et ressources -* Site officiel de l'app : +* Site officiel de l’app : * Documentation officielle utilisateur : -* Dépôt de code officiel de l'app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -72,4 +73,4 @@ ou sudo yunohost app upgrade tooljet -u https://github.com/YunoHost-Apps/tooljet_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 8d730db7d552efe994df3aea693ddf65c6b33108 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 14 Apr 2023 06:22:03 +0000 Subject: [PATCH 065/104] Upgrade to v2.4.3 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 7067b60..ac43630 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v1.31.2.tar.gz -SOURCE_SUM=49a3a01f3f53aab218237c033380c44c6c44cffcb161bd032bb5fdad0b62f1cf +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.4.3.tar.gz +SOURCE_SUM=e30f89717e6bbcbd357e365c6b99e72db969ae2ac352b20775a6412ee6da616f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 5a89122..469c3a5 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "1.31.2~ynh1", + "version": "2.4.3~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From a459160d6f351dd2be90d34715723381f911cace Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 14 Apr 2023 06:22:08 +0000 Subject: [PATCH 066/104] Auto-update README --- README.md | 5 +++-- README_fr.md | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 071d96e..a8c9791 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # ToolJet for YunoHost -[![Integration level](https://dash.yunohost.org/integration/tooljet.svg)](https://dash.yunohost.org/appci/app/tooljet) ![Working status](https://ci-apps.yunohost.org/ci/badges/tooljet.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/tooljet.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/tooljet.svg)](https://dash.yunohost.org/appci/app/tooljet) ![Working status](https://ci-apps.yunohost.org/ci/badges/tooljet.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/tooljet.maintain.svg) + [![Install ToolJet with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tooljet) *[Lire ce readme en français.](./README_fr.md)* @@ -34,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 1.31.2~ynh1 +**Shipped version:** 2.4.3~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 50ec8b5..35bae97 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # ToolJet pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/tooljet.svg)](https://dash.yunohost.org/appci/app/tooljet) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/tooljet.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/tooljet.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/tooljet.svg)](https://dash.yunohost.org/appci/app/tooljet) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/tooljet.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/tooljet.maintain.svg) + [![Installer ToolJet avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tooljet) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer ToolJet rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer ToolJet rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble ToolJet is an open-source low-code framework to build and deploy internal tools quickly without much effort from the engineering teams. You can connect to your data sources, such as databases (like PostgreSQL, MongoDB, Elasticsearch, etc), API endpoints (ToolJet supports importing OpenAPI spec & OAuth2 authorization), and external services (like Stripe, Slack, Google Sheets, Airtable) and use our pre-built UI widgets to build internal tools. @@ -34,11 +35,11 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 1.31.2~ynh1 +**Version incluse :** 2.4.3~ynh1 -## Captures d'écran +## Captures d’écran -![Capture d'écran de ToolJet](./doc/screenshots/example.png) +![Capture d’écran de ToolJet](./doc/screenshots/example.png) ## Avertissements / informations importantes @@ -54,9 +55,9 @@ TODO ## Documentations et ressources -* Site officiel de l'app : +* Site officiel de l’app : * Documentation officielle utilisateur : -* Dépôt de code officiel de l'app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -72,4 +73,4 @@ ou sudo yunohost app upgrade tooljet -u https://github.com/YunoHost-Apps/tooljet_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 1a979adfab50989afb90451567d7119fb9b8683a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 14 Apr 2023 12:46:05 +0200 Subject: [PATCH 067/104] Requires NodeJS 18 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index edbea54..b2a8d8e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="postgresql postgresql-contrib libpq-dev" -NODEJS_VERSION="14" +NODEJS_VERSION="18" main_domain=$(cat /etc/yunohost/current_host) From 938d116b9805cbea774b6c2b7d0a2552e2141509 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 14 Apr 2023 17:54:28 +0200 Subject: [PATCH 068/104] Requires NPM v8.11.0 --- scripts/_common.sh | 1 + scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b2a8d8e..024c6ab 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,6 +8,7 @@ pkg_dependencies="postgresql postgresql-contrib libpq-dev" NODEJS_VERSION="18" +NPM_VERSION="8.11.0" main_domain=$(cat /etc/yunohost/current_host) diff --git a/scripts/install b/scripts/install index 7556c4e..6dd08a9 100755 --- a/scripts/install +++ b/scripts/install @@ -123,7 +123,7 @@ pushd $final_path # The version shipped by default with n does not work, there is a # wierd dependency issue about unsupported platform and fsevent. # See https://github.com/ToolJet/ToolJet/pull/1752 - $ynh_npm install -g npm@7.20.0 + $ynh_npm install -g npm$NPM_VERSION ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install -f ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build diff --git a/scripts/upgrade b/scripts/upgrade index 992b406..a9b9e20 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -120,7 +120,7 @@ pushd $final_path # The version shipped by default with n does not work, there is a # wierd dependency issue about unsupported platform and fsevent. # See https://github.com/ToolJet/ToolJet/pull/1752 - $ynh_npm install -g npm@7.20.0 + $ynh_npm install -g npm@$NPM_VERSION ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install -f ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build From 5d374b4ac09102a74bc08a30ffba6cb70e35f790 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 15 Apr 2023 06:20:51 +0000 Subject: [PATCH 069/104] Upgrade to v2.4.5 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index ac43630..7839789 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.4.3.tar.gz -SOURCE_SUM=e30f89717e6bbcbd357e365c6b99e72db969ae2ac352b20775a6412ee6da616f +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.4.5.tar.gz +SOURCE_SUM=dbbf7db24e6401d37a0f12be791da0cc21c9e61766bcf5f2bf4958021ccc8ada SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 469c3a5..96e338d 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "2.4.3~ynh1", + "version": "2.4.5~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 7c5503b1a86f17152769d29a90629815483bcca2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 15 Apr 2023 06:20:56 +0000 Subject: [PATCH 070/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a8c9791..5eb55da 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 2.4.3~ynh1 +**Shipped version:** 2.4.5~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 35bae97..b9ff622 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 2.4.3~ynh1 +**Version incluse :** 2.4.5~ynh1 ## Captures d’écran From 2955763cd6ad84659f2accf0ff9b044e93cbd592 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 16 Apr 2023 18:48:15 +0200 Subject: [PATCH 071/104] Fix NPM requirement --- scripts/_common.sh | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 024c6ab..3fa62d8 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,7 +8,7 @@ pkg_dependencies="postgresql postgresql-contrib libpq-dev" NODEJS_VERSION="18" -NPM_VERSION="8.11.0" +NPM_VERSION=">=8.11" main_domain=$(cat /etc/yunohost/current_host) diff --git a/scripts/install b/scripts/install index 6dd08a9..5f0190c 100755 --- a/scripts/install +++ b/scripts/install @@ -123,7 +123,7 @@ pushd $final_path # The version shipped by default with n does not work, there is a # wierd dependency issue about unsupported platform and fsevent. # See https://github.com/ToolJet/ToolJet/pull/1752 - $ynh_npm install -g npm$NPM_VERSION + $ynh_npm install -g npm@"$NPM_VERSION" ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install -f ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build diff --git a/scripts/upgrade b/scripts/upgrade index a9b9e20..4e525ee 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -120,7 +120,7 @@ pushd $final_path # The version shipped by default with n does not work, there is a # wierd dependency issue about unsupported platform and fsevent. # See https://github.com/ToolJet/ToolJet/pull/1752 - $ynh_npm install -g npm@$NPM_VERSION + $ynh_npm install -g npm@"$NPM_VERSION" ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install -f ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build From bf1473def670f7dd48efaeefdf045fff9062535d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 18 Apr 2023 06:22:46 +0000 Subject: [PATCH 072/104] Upgrade to v2.4.6 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 7839789..c0afb45 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.4.5.tar.gz -SOURCE_SUM=dbbf7db24e6401d37a0f12be791da0cc21c9e61766bcf5f2bf4958021ccc8ada +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.4.6.tar.gz +SOURCE_SUM=82f0341951f0311fe4e5b8a4e3b39fcf119208ef024d2f2c0d04db0119c865f2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 96e338d..47e4404 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "2.4.5~ynh1", + "version": "2.4.6~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From f88bc5fb143a2ab24a3a281c6281c6aa5b5c32c7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 18 Apr 2023 06:22:50 +0000 Subject: [PATCH 073/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5eb55da..bfcfe56 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 2.4.5~ynh1 +**Shipped version:** 2.4.6~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index b9ff622..6997b25 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 2.4.5~ynh1 +**Version incluse :** 2.4.6~ynh1 ## Captures d’écran From 569118c4a066cd06cf09b119d68a77d9eed36f51 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 21 Apr 2023 06:22:27 +0000 Subject: [PATCH 074/104] Upgrade to v2.4.9 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index c0afb45..eb0e218 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.4.6.tar.gz -SOURCE_SUM=82f0341951f0311fe4e5b8a4e3b39fcf119208ef024d2f2c0d04db0119c865f2 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.4.9.tar.gz +SOURCE_SUM=5c207cfcf2b756003cf5eac6c5ac7a597ff8bafff8ed8a15fc83e8ea3b68cc24 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 47e4404..e4266b5 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "2.4.6~ynh1", + "version": "2.4.9~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 5f5a8de11889c41043f787d389e6b58f8e557ba5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 21 Apr 2023 06:22:31 +0000 Subject: [PATCH 075/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bfcfe56..2d49eda 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 2.4.6~ynh1 +**Shipped version:** 2.4.9~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 6997b25..e344e93 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 2.4.6~ynh1 +**Version incluse :** 2.4.9~ynh1 ## Captures d’écran From 343838dfa0fc7c1a8c3adc67730a020cb3ba0015 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 24 May 2023 06:21:33 +0000 Subject: [PATCH 076/104] Upgrade to v2.6.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index eb0e218..7d0d116 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.4.9.tar.gz -SOURCE_SUM=5c207cfcf2b756003cf5eac6c5ac7a597ff8bafff8ed8a15fc83e8ea3b68cc24 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.6.0.tar.gz +SOURCE_SUM=bec017c9bd623f7a1ed8f8c3dffe63cce5742e2055a1eba6261f718db0f1829c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index e4266b5..170102a 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "2.4.9~ynh1", + "version": "2.6.0~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 654585ca9f82cfd6246a44d1027850059fd0c7f9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 24 May 2023 06:21:37 +0000 Subject: [PATCH 077/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2d49eda..be1e927 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 2.4.9~ynh1 +**Shipped version:** 2.6.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index e344e93..3c48371 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 2.4.9~ynh1 +**Version incluse :** 2.6.0~ynh1 ## Captures d’écran From 6a4231464036e4d8414414f39cba753fdc8c9388 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Wed, 24 May 2023 10:40:51 +0200 Subject: [PATCH 078/104] Update _common.sh --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 3fa62d8..7e05a75 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,8 +7,8 @@ # dependencies used by the app pkg_dependencies="postgresql postgresql-contrib libpq-dev" -NODEJS_VERSION="18" -NPM_VERSION=">=8.11" +NODEJS_VERSION="18.3" +NPM_VERSION="8.11.0" main_domain=$(cat /etc/yunohost/current_host) From 3dc1f1a28b9ee7fb80a80b2df5c43ca1b7680948 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 26 May 2023 06:21:25 +0000 Subject: [PATCH 079/104] Upgrade to v2.6.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 7d0d116..583fbf9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.6.0.tar.gz -SOURCE_SUM=bec017c9bd623f7a1ed8f8c3dffe63cce5742e2055a1eba6261f718db0f1829c +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.6.1.tar.gz +SOURCE_SUM=2a3a844283569d9e4f80f7e6d312d6c98172654f00b9e47ba8c39e2ad7b7ebd1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 170102a..a2c031d 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "2.6.0~ynh1", + "version": "2.6.1~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 9e4757f7202561eaeec196e125b49d5a23e79c69 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 26 May 2023 06:21:30 +0000 Subject: [PATCH 080/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index be1e927..cfcea93 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 2.6.0~ynh1 +**Shipped version:** 2.6.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 3c48371..b815fcd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 2.6.0~ynh1 +**Version incluse :** 2.6.1~ynh1 ## Captures d’écran From 5ba6d443a9d52dc40314e14944964a2ce4864043 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 27 May 2023 06:20:16 +0000 Subject: [PATCH 081/104] Upgrade to v2.6.2 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 583fbf9..50ace86 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.6.1.tar.gz -SOURCE_SUM=2a3a844283569d9e4f80f7e6d312d6c98172654f00b9e47ba8c39e2ad7b7ebd1 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.6.2.tar.gz +SOURCE_SUM=8b1b694ce6ad3c8c5511d912958ce63cbbef8c736750e430553dc80d888c88ab SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index a2c031d..1f87100 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "2.6.1~ynh1", + "version": "2.6.2~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From e4948d807149940d47f480d566bd1fd83fb859c5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 27 May 2023 06:20:20 +0000 Subject: [PATCH 082/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cfcea93..18dc988 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 2.6.1~ynh1 +**Shipped version:** 2.6.2~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index b815fcd..cf6f51f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 2.6.1~ynh1 +**Version incluse :** 2.6.2~ynh1 ## Captures d’écran From abb7e6ba26e3135917db1b2fdfac4ca44ec0dbfd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 1 Jul 2023 06:23:24 +0000 Subject: [PATCH 083/104] Upgrade to v2.8.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 50ace86..3c23e4b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.6.2.tar.gz -SOURCE_SUM=8b1b694ce6ad3c8c5511d912958ce63cbbef8c736750e430553dc80d888c88ab +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.8.1.tar.gz +SOURCE_SUM=414979fdf682d38a019ee6c4dd2554afea265371f9e4df99e90cebdb95a817cc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 1f87100..b296338 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "2.6.2~ynh1", + "version": "2.8.1~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 80a1f2c517e0dd6413456eaafff2ad97e999554e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 1 Jul 2023 06:23:28 +0000 Subject: [PATCH 084/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 18dc988..ef2cf39 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 2.6.2~ynh1 +**Shipped version:** 2.8.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index cf6f51f..45ab631 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 2.6.2~ynh1 +**Version incluse :** 2.8.1~ynh1 ## Captures d’écran From acc685c220e1536db1b3877faeefa097c9166fa8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 13:52:13 +0200 Subject: [PATCH 085/104] Upgrade to version 2.9.2 (#58) * Upgrade to v2.9.2 * Auto-update README --------- Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ef2cf39..f2c230a 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 2.8.1~ynh1 +**Shipped version:** 2.9.2~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 45ab631..0b1535f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 2.8.1~ynh1 +**Version incluse :** 2.9.2~ynh1 ## Captures d’écran diff --git a/conf/app.src b/conf/app.src index 3c23e4b..eff80fd 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.8.1.tar.gz -SOURCE_SUM=414979fdf682d38a019ee6c4dd2554afea265371f9e4df99e90cebdb95a817cc +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.9.2.tar.gz +SOURCE_SUM=2da71cff407047be12c4ca59846b412c5c63d2b6922a2e0189093c1992601649 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index b296338..76252f5 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "2.8.1~ynh1", + "version": "2.9.2~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From a204f7c42be08bacc5c964cabd8d2d954d37dab5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 12 Aug 2023 06:18:52 +0000 Subject: [PATCH 086/104] Upgrade to v2.13.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index eff80fd..531ae69 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.9.2.tar.gz -SOURCE_SUM=2da71cff407047be12c4ca59846b412c5c63d2b6922a2e0189093c1992601649 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.13.1.tar.gz +SOURCE_SUM=bc37ff70596d464212f809d0a266c04cb58d90fba4f7bd491ea618c959eb50a8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 76252f5..b6889bf 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "2.9.2~ynh1", + "version": "2.13.1~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 7f108c6f0812f8d5d8d76a653b074f89909c3f39 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 12 Aug 2023 06:18:56 +0000 Subject: [PATCH 087/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f2c230a..f81fdba 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 2.9.2~ynh1 +**Shipped version:** 2.13.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 0b1535f..d832416 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 2.9.2~ynh1 +**Version incluse :** 2.13.1~ynh1 ## Captures d’écran From bd78b16638a401dc909f275895394700a26fb7c5 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 12 Aug 2023 19:35:24 +0200 Subject: [PATCH 088/104] Packaging v2 --- check_process | 29 ----------- conf/.env.example | 2 +- conf/app.src | 6 --- conf/nginx.conf | 2 +- conf/systemd.service | 4 +- doc/DISCLAIMER.md | 9 ---- manifest.json | 40 --------------- manifest.toml | 63 ++++++++++++++++++++++++ scripts/_common.sh | 3 -- scripts/backup | 46 +---------------- scripts/change_url | 97 ++---------------------------------- scripts/install | 114 ++++--------------------------------------- scripts/remove | 47 ------------------ scripts/restore | 58 ++-------------------- scripts/upgrade | 62 +++++++++++------------ tests.toml | 3 ++ 16 files changed, 120 insertions(+), 465 deletions(-) delete mode 100644 check_process delete mode 100644 conf/app.src delete mode 100644 doc/DISCLAIMER.md delete mode 100644 manifest.json create mode 100644 manifest.toml create mode 100644 tests.toml diff --git a/check_process b/check_process deleted file mode 100644 index 87a6a2e..0000000 --- a/check_process +++ /dev/null @@ -1,29 +0,0 @@ -# See here for more information -# https://github.com/YunoHost/package_check#syntax-check_process-file - -# Move this file from check_process.default to check_process when you have filled it. - -;; Test complet - ; Manifest - domain="domain.tld" - is_public=1 - ; Checks - pkg_linter=1 - setup_sub_dir=0 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 -# upgrade=1 from_commit=CommitHash - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options -# ; commit=CommitHash -# name=Name and date of the commit. -# manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& diff --git a/conf/.env.example b/conf/.env.example index 748f4ca..086231b 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -19,7 +19,7 @@ PG_PASS=__DB_PWD__ CHECK_FOR_UPDATES=check_if_updates_are_available # EMAIL CONFIGURATION -DEFAULT_FROM_EMAIL=tooljet@__DOMAIN__ +DEFAULT_FROM_EMAIL=__APP__@__DOMAIN__ SMTP_DOMAIN=__MAIN_DOMAIN__ SMTP_PORT=25 diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 531ae69..0000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.13.1.tar.gz -SOURCE_SUM=bc37ff70596d464212f809d0a266c04cb58d90fba4f7bd491ea618c959eb50a8 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/conf/nginx.conf b/conf/nginx.conf index 4c17f16..842612a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,6 +1,6 @@ location / { # Path to source - root __FINALPATH__/frontend/build/; + root __INSTALL_DIR__/frontend/build/; try_files $uri $uri/ /index.html @proxy; error_page 405 @proxy; diff --git a/conf/systemd.service b/conf/systemd.service index cf78bc2..14d602e 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -6,10 +6,10 @@ After=network.target Type=simple User=__APP__ Group=__APP__ -WorkingDirectory=__FINALPATH__/ +WorkingDirectory=__INSTALL_DIR__/ Environment="__YNH_NODE_LOAD_PATH__" ExecStart=__YNH_NPM__ run start:prod -StandardOutput=append:/var/log/__APP__/__APP__.log +StandardOutput=journal StandardError=inherit # Sandboxing options to harden security diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md deleted file mode 100644 index 6b83f15..0000000 --- a/doc/DISCLAIMER.md +++ /dev/null @@ -1,9 +0,0 @@ -### After installation - -TODO - -### Limitations - -* Require YunoHost 11. -* This app requires a full dedicated domain (or subdomain), with a signed certificate. -* Single Sign-On and LDAP integration does *not* work. diff --git a/manifest.json b/manifest.json deleted file mode 100644 index b6889bf..0000000 --- a/manifest.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "ToolJet", - "id": "tooljet", - "packaging_format": 1, - "description": { - "en": "Open-source low-code framework for building React-based web applications and internal tools" - }, - "version": "2.13.1~ynh1", - "url": "https://tooljet.com/", - "upstream": { - "license": "AGPL-3.0", - "website": "https://tooljet.com/", - "userdoc": "https://docs.tooljet.com/docs/intro", - "code": "https://github.com/ToolJet/ToolJet" - }, - "license": "AGPL-3.0", - "maintainer": { - "name": "Tagadda" - }, - "requirements": { - "yunohost": ">= 11" - }, - "multi_instance": true, - "services": [ - "nginx" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "is_public", - "type": "boolean", - "default": true - } - ] - } -} diff --git a/manifest.toml b/manifest.toml new file mode 100644 index 0000000..a855b1e --- /dev/null +++ b/manifest.toml @@ -0,0 +1,63 @@ +packaging_format = 2 + +id = "tooljet" +name = "ToolJet" +description.en = "Open-source low-code framework for building React-based web applications and internal tools" + +version = "2.13.1~ynh1" + +maintainers = ["Tagadda"] + +[upstream] +license = "AGPL-3.0" +website = "https://tooljet.com/" +userdoc = "https://docs.tooljet.com/docs/intro" +code = "https://github.com/ToolJet/ToolJet" +cpe = "cpe:2.3:a:tooljet:tooljet" + +[integration] +yunohost = ">= 11.2" +architectures = "all" +multi_instance = true +ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. +sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. +disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... +ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... + +[install] + [install.domain] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "domain" + full_domain = true + + [install.init_main_permission] + type = "group" + default = "visitors" + +[resources] + + [resources.sources] + + [resources.sources.main] + url = "https://github.com/ToolJet/ToolJet/archive/v2.13.1.tar.gz" + sha256 = "bc37ff70596d464212f809d0a266c04cb58d90fba4f7bd491ea618c959eb50a8" + + autoupdate.strategy = "latest_github_tag" + + [resources.system_user] + allow_email = true + + [resources.install_dir] + + [resources.permissions] + main.url = "/" + + [resources.ports] + main.default = 8095 + + [resources.apt] + packages = "postgresql, postgresql-contrib, libpq-dev" + + [resources.database] + type = "postgresql" diff --git a/scripts/_common.sh b/scripts/_common.sh index 7e05a75..5676dec 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,6 @@ # COMMON VARIABLES #================================================= -# dependencies used by the app -pkg_dependencies="postgresql postgresql-contrib libpq-dev" - NODEJS_VERSION="18.3" NPM_VERSION="8.11.0" diff --git a/scripts/backup b/scripts/backup index eaa377d..fc90e72 100755 --- a/scripts/backup +++ b/scripts/backup @@ -10,56 +10,15 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_print_info --message="Loading installation settings..." - -app=$YNH_APP_INSTANCE_NAME - -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -domain=$(ynh_app_setting_get --app=$app --key=domain) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= ynh_print_info --message="Declaring files to be backed up..." -### N.B. : the following 'ynh_backup' calls are only a *declaration* of what needs -### to be backuped and not an actual copy of any file. The actual backup that -### creates and fill the archive with the files happens in the core after this -### script is called. Hence ynh_backups calls takes basically 0 seconds to run. - -#================================================= -# BACKUP THE APP MAIN DIR -#================================================= - -ynh_backup --src_path="$final_path" - -#================================================= -# BACKUP THE NGINX CONFIGURATION -#================================================= +ynh_backup --src_path="$install_dir" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP SYSTEMD -#================================================= - ynh_backup --src_path="/etc/systemd/system/$app.service" #================================================= @@ -67,9 +26,6 @@ ynh_backup --src_path="/etc/systemd/system/$app.service" #================================================= ynh_print_info --message="Backing up the PostgreSQL database..." -### (However, things like PostgreSQL dumps *do* take some time to run, though the -### copy of the generated dump to the archive still happens later) - ynh_psql_dump_db --database="$db_name" > db.sql #================================================= diff --git a/scripts/change_url b/scripts/change_url index cfd5dd4..5b1a4b5 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,66 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH - -new_domain=$YNH_APP_NEW_DOMAIN -new_path="/" - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -# Needed for .env and nginx.conf -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -port=$(ynh_app_setting_get --app=$app --key=port) -domain=$(ynh_app_setting_get --app=$app --key=domain) -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) -lockbox_master_key=$(ynh_app_setting_get --app=$app --key=lockbox_master_key) -secret_key_base=$(ynh_app_setting_get --app=$app --key=secret_key_base) - -#================================================= -# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. - ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - - # Restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -change_domain=0 -if [ "$old_domain" != "$new_domain" ] -then - change_domain=1 -fi - -change_path=0 -if [ "$old_path" != "$new_path" ] -then - change_path=1 -fi - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -83,29 +23,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 -nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf - -# Change the path in the NGINX config file -if [ $change_path -eq 1 ] -then - # Make a backup of the original NGINX config file if modified - ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" - # Create a dedicated NGINX config - ynh_add_nginx_config -fi - -# Change the domain for NGINX -if [ $change_domain -eq 1 ] -then - # Delete file checksum for the old conf file location - ynh_delete_file_checksum --file="$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi +ynh_change_url_nginx_config #================================================= # SPECIFIC MODIFICATIONS @@ -114,10 +32,10 @@ fi #================================================= ynh_script_progression --message="Updating a configuration file..." --weight=1 -ynh_add_config --template=".env.example" --destination="$final_path/.env" +ynh_add_config --template=".env.example" --destination="$install_dir/.env" -chmod 400 "$final_path/.env" -chown $app:$app "$final_path/.env" +chmod 400 "$install_dir/.env" +chown $app:$app "$install_dir/.env" #================================================= # GENERIC FINALISATION @@ -128,13 +46,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index 5f0190c..63e8727 100755 --- a/scripts/install +++ b/scripts/install @@ -9,98 +9,24 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST -#================================================= - -domain=$YNH_APP_ARG_DOMAIN -path_url="/" -is_public=$YNH_APP_ARG_IS_PUBLIC - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS -#================================================= -ynh_script_progression --message="Validating installation parameters..." --weight=1 - -### If the app uses NGINX as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app". -### If the app provides an internal web server (or uses another application server such as uWSGI), the final path should be "/opt/yunohost/$app" -final_path=/var/www/$app -test ! -e "$final_path" || ynh_die --message="This path already contains a folder" - -# Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -ynh_script_progression --message="Storing installation settings..." --weight=1 - -ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url - -#================================================= -# STANDARD MODIFICATIONS -#================================================= -# FIND AND OPEN A PORT -#================================================= -ynh_script_progression --message="Finding an available port..." --weight=1 -# Find an available port -port=$(ynh_find_port --port=8095) -ynh_app_setting_set --app=$app --key=port --value=$port - #================================================= # INSTALL DEPENDENCIES #================================================= ynh_script_progression --message="Installing dependencies..." --weight=1 -ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=1 - -# Create a system user -ynh_system_user_create --username=$app --home_dir="$final_path" - -#================================================= -# CREATE A POSTGRESQL DATABASE -#================================================= -ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1 - -ynh_psql_test_if_first_run - -db_name=$(ynh_sanitize_dbid --db_name=$app) -db_user=$db_name -ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_psql_setup_db --db_user=$db_user --db_name=$db_name - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -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" +ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # NGINX CONFIGURATION @@ -117,11 +43,11 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Building ToolJet..." --weight=10 -pushd $final_path +pushd $install_dir ynh_use_nodejs # The version shipped by default with n does not work, there is a - # wierd dependency issue about unsupported platform and fsevent. + # weird dependency issue about unsupported platform and fsevent. # See https://github.com/ToolJet/ToolJet/pull/1752 $ynh_npm install -g npm@"$NPM_VERSION" @@ -142,17 +68,17 @@ ynh_app_setting_set --app="$app" --key=lockbox_master_key --value="$lockbox_mast secret_key_base=$(ynh_string_random --length=64 | xxd -p | head -n1 | cut -c 1-64) ynh_app_setting_set --app="$app" --key=secret_key_base --value="$secret_key_base" -ynh_add_config --template=".env.example" --destination="$final_path/.env" +ynh_add_config --template=".env.example" --destination="$install_dir/.env" -chmod 400 "$final_path/.env" -chown $app:$app "$final_path/.env" +chmod 400 "$install_dir/.env" +chown $app:$app "$install_dir/.env" #================================================= # BUILD THE DATABASE #================================================= ynh_script_progression --message="Building ToolJet database..." --weight=1 -pushd $final_path +pushd $install_dir # Build the database once the configuration is set ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run db:migrate popd @@ -182,26 +108,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Configuring permissions..." --weight=1 - -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. - ynh_permission_update --permission="main" --add="visitors" -fi - -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index ed2edfd..1255644 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,19 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -app=$YNH_APP_INSTANCE_NAME - -domain=$(ynh_app_setting_get --app=$app --key=domain) -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) - #================================================= # STANDARD REMOVE #================================================= @@ -43,22 +30,6 @@ ynh_script_progression --message="Stopping and removing the systemd service..." # Remove the dedicated systemd config ynh_remove_systemd_config -#================================================= -# REMOVE THE POSTGRESQL DATABASE -#================================================= -ynh_script_progression --message="Removing the PostgreSQL database..." --weight=1 - -# Remove a database if it exists, along with the associated user -ynh_psql_remove_db --db_user=$db_user --db_name=$db_name - -#================================================= -# REMOVE APP MAIN DIR -#================================================= -ynh_script_progression --message="Removing app main directory..." --weight=1 - -# Remove the app directory securely -ynh_secure_remove --file="$final_path" - #================================================= # REMOVE NGINX CONFIGURATION #================================================= @@ -72,26 +43,8 @@ ynh_remove_nginx_config #================================================= ynh_script_progression --message="Removing dependencies..." --weight=1 -# Remove metapackage and its dependencies -ynh_remove_app_dependencies ynh_remove_nodejs -#================================================= -# SPECIFIC REMOVE -#================================================= -# ... -#================================================= - -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -ynh_script_progression --message="Removing the dedicated system user..." --weight=1 - -# Delete a system user -ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 2cc3cd1..e06d7da 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,44 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -ynh_clean_setup () { - #### Remove this function if there's nothing to clean before calling the remove script. - true -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -app=$YNH_APP_INSTANCE_NAME - -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -port=$(ynh_app_setting_get --app=$app --key=port) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name - -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -ynh_script_progression --message="Validating restoration parameters..." --weight=1 - -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " - -#ynh_port_available --port=$port \ -# || ynh_die --message="Port $port is needs to be available for this app" -# FIXME: I had to comment this, because somehow in package_check 9085 still in -# in use after removal/before restore ? - #================================================= # STANDARD RESTORATION STEPS #================================================= @@ -57,24 +19,16 @@ ynh_script_progression --message="Restoring the NGINX web server configuration.. ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" - #================================================= # RESTORE THE APP MAIN DIR #================================================= ynh_script_progression --message="Restoring the app main directory..." --weight=1 -ynh_restore_file --origin_path="$final_path" +ynh_restore_file --origin_path="$install_dir" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # SPECIFIC RESTORATION @@ -83,8 +37,6 @@ chown -R $app:www-data "$final_path" #================================================= ynh_script_progression --message="Reinstalling dependencies..." --weight=1 -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION #================================================= @@ -92,8 +44,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION #================================================= ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1 -db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) -ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4e525ee..3d555e2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,19 +12,19 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? 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) -port=$(ynh_app_setting_get --app=$app --key=port) -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) -lockbox_master_key=$(ynh_app_setting_get --app=$app --key=lockbox_master_key) -secret_key_base=$(ynh_app_setting_get --app=$app --key=secret_key_base) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? port=$(ynh_app_setting_get --app=$app --key=port) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? db_user=$db_name +#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +#REMOVEME? lockbox_master_key=$(ynh_app_setting_get --app=$app --key=lockbox_master_key) +#REMOVEME? secret_key_base=$(ynh_app_setting_get --app=$app --key=secret_key_base) #================================================= # CHECK VERSION @@ -41,16 +41,16 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 +#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? ynh_clean_setup () { # Restore it if the upgrade fails - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS @@ -71,10 +71,10 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 +#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -85,12 +85,12 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$install_dir" fi -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # NGINX CONFIGURATION @@ -103,9 +103,9 @@ ynh_add_nginx_config #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=1 -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #================================================= # SPECIFIC UPGRADE @@ -114,7 +114,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= ynh_script_progression --message="Building ToolJet..." --weight=10 -pushd $final_path +pushd $install_dir ynh_use_nodejs # The version shipped by default with n does not work, there is a @@ -131,17 +131,17 @@ popd #================================================= ynh_script_progression --message="Updating a configuration file..." --weight=1 -ynh_add_config --template=".env.example" --destination="$final_path/.env" +ynh_add_config --template=".env.example" --destination="$install_dir/.env" -chmod 400 "$final_path/.env" -chown $app:$app "$final_path/.env" +chmod 400 "$install_dir/.env" +chown $app:$app "$install_dir/.env" #================================================= # BUILD THE DATABASE #================================================= ynh_script_progression --message="Building ToolJet database..." --weight=1 -pushd $final_path +pushd $install_dir # Build the database once the configuration is set ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run db:migrate popd @@ -173,9 +173,9 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..06bfad9 --- /dev/null +++ b/tests.toml @@ -0,0 +1,3 @@ +test_format = 1.0 + +[default] From 44636abf28397b1a36e34fdb7b2a50a05f10f47a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 12 Aug 2023 17:35:37 +0000 Subject: [PATCH 089/104] Auto-update README --- README.md | 12 ------------ README_fr.md | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/README.md b/README.md index f81fdba..cccb57f 100644 --- a/README.md +++ b/README.md @@ -41,18 +41,6 @@ ToolJet is an open-source low-code framework to build and deploy internal tools ![Screenshot of ToolJet](./doc/screenshots/example.png) -## Disclaimers / important information - -### After installation - -TODO - -### Limitations - -* Require YunoHost 11. -* This app requires a full dedicated domain (or subdomain), with a signed certificate. -* Single Sign-On and LDAP integration does *not* work. - ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index d832416..a610a20 100644 --- a/README_fr.md +++ b/README_fr.md @@ -41,18 +41,6 @@ ToolJet is an open-source low-code framework to build and deploy internal tools ![Capture d’écran de ToolJet](./doc/screenshots/example.png) -## Avertissements / informations importantes - -### After installation - -TODO - -### Limitations - -* Require YunoHost 11. -* This app requires a full dedicated domain (or subdomain), with a signed certificate. -* Single Sign-On and LDAP integration does *not* work. - ## Documentations et ressources * Site officiel de l’app : From dcbc03145ee33fb390b9862d9f05cb9025b6ba9f Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 12 Aug 2023 19:53:01 +0200 Subject: [PATCH 090/104] Update nginx.conf --- conf/nginx.conf | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 842612a..b8a06e8 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -13,6 +13,24 @@ location /api/ { try_files /_bypass_to_proxy @proxy; } +location /ws +{ + proxy_pass http://127.0.0.1:__PORT__; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + proxy_set_header Host $host; +} + +location /yjs +{ + proxy_pass http://127.0.0.1:__PORT__; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + proxy_set_header Host $host; +} + location @proxy { proxy_pass http://127.0.0.1:__PORT__; proxy_redirect off; From 001aecde0f6942dbcd57b0ab54a54481a3e44d8c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 30 Aug 2023 06:21:19 +0000 Subject: [PATCH 091/104] Upgrade to v2.14.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 531ae69..bfb73f2 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.13.1.tar.gz -SOURCE_SUM=bc37ff70596d464212f809d0a266c04cb58d90fba4f7bd491ea618c959eb50a8 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.14.1.tar.gz +SOURCE_SUM=65c7306ed1a536293511450438ad248aaf9134b5ac9bc23e73c694f051c68041 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index b6889bf..cbaee1e 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "2.13.1~ynh1", + "version": "2.14.1~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From 06bc3fb3a19de8c9e6307049e03ed8415719f364 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 30 Aug 2023 06:21:24 +0000 Subject: [PATCH 092/104] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f81fdba..924c330 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 2.13.1~ynh1 +**Shipped version:** 2.14.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index d832416..aa0fa2f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 2.13.1~ynh1 +**Version incluse :** 2.14.1~ynh1 ## Captures d’écran From 57c8696942842c5055540105f667712b5018b9d0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 21:14:01 +0200 Subject: [PATCH 093/104] Upgrade to version 2.16.1 (#74) * Upgrade to v2.16.1 * Auto-update README --------- Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 924c330..e0837f0 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Shipped version:** 2.14.1~ynh1 +**Shipped version:** 2.16.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index aa0fa2f..72e269d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ ToolJet is an open-source low-code framework to build and deploy internal tools - *Doesn't store data:* ToolJet acts only as a proxy and doesn't store any data. -**Version incluse :** 2.14.1~ynh1 +**Version incluse :** 2.16.1~ynh1 ## Captures d’écran diff --git a/conf/app.src b/conf/app.src index bfb73f2..1668c1e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.14.1.tar.gz -SOURCE_SUM=65c7306ed1a536293511450438ad248aaf9134b5ac9bc23e73c694f051c68041 +SOURCE_URL=https://github.com/ToolJet/ToolJet/archive/v2.16.1.tar.gz +SOURCE_SUM=f3ba9112ba4afeabeda451ce302afb3fa431ba7f030702cc67457c37bc104a9f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index cbaee1e..a7cdf45 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Open-source low-code framework for building React-based web applications and internal tools" }, - "version": "2.14.1~ynh1", + "version": "2.16.1~ynh1", "url": "https://tooljet.com/", "upstream": { "license": "AGPL-3.0", From a8e7cc940da2d9421e855da7330c2f88a44d4816 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 13 Sep 2023 13:46:45 +0200 Subject: [PATCH 094/104] Delete .github/workflows directory --- .github/workflows/updater.sh | 108 ---------------------------------- .github/workflows/updater.yml | 50 ---------------- 2 files changed, 158 deletions(-) delete mode 100755 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100755 index c204b3c..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -#================================================= -# PACKAGE UPDATING HELPER -#================================================= - -# This script is meant to be run by GitHub Actions -# The YunoHost-Apps organisation offers a template Action to run this script periodically -# Since each app is different, maintainers can adapt its contents so as to perform -# automatic actions when a new upstream release is detected. - -#================================================= -# FETCHING LATEST RELEASE AND ITS ASSETS -#================================================= - -# Fetching information -current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') -repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') -# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) -version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) - -# Later down the script, we assume the version has only digits and dots -# Sometimes the release name starts with a "v", so let's filter it out. -# You may need more tweaks here if the upstream repository has different naming conventions. -if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} -fi - -# Setting up the environment variables -echo "Current version: $current_version" -echo "Latest release from upstream: $version" -echo "VERSION=$version" >> $GITHUB_ENV -echo "REPO=$repo" >> $GITHUB_ENV -# For the time being, let's assume the script will fail -echo "PROCEED=false" >> $GITHUB_ENV - -# Proceed only if the retrieved version is greater than the current one -if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 -# Proceed only if a PR for this new version does not already exist -elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 -fi - -#================================================= -# UPDATE SOURCE FILES -#================================================= - -asset_url="https://github.com/$repo/archive/v$version.tar.gz" -src="app" - -# If $src is not empty, let's process the asset -if [ ! -z "$src" ]; then - -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download sources and calculate checksum -filename=${asset_url##*/} -curl --silent -4 -L $asset_url -o "$tempdir/$filename" -checksum=$(sha256sum "$tempdir/$filename" | head -c 64) - -# Delete temporary directory -rm -rf $tempdir - -# Get extension -if [[ $filename == *.tar.gz ]]; then - extension=tar.gz -else - extension=${filename##*.} -fi - -# Rewrite source file -cat < conf/$src.src -SOURCE_URL=$asset_url -SOURCE_SUM=$checksum -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=$extension -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -EOT -echo "... conf/$src.src updated" - -else -echo "... asset ignored" -fi - -#================================================= -# SPECIFIC UPDATE STEPS -#================================================= - -# Any action on the app's source code can be done. -# The GitHub Action workflow takes care of committing all changes after this script ends. - -#================================================= -# GENERIC FINALIZATION -#================================================= - -# Replace new version in manifest -echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json - -# No need to update the README, yunohost-bot takes care of it - -# The Action will proceed only if the PROCEED environment variable is set to true -echo "PROCEED=true" >> $GITHUB_ENV -exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml deleted file mode 100644 index 4a866ff..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. -# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. -# This file should be enough by itself, but feel free to tune it to your needs. -# It calls updater.sh, which is where you should put the app-specific update steps. -name: Check for new upstream releases -on: - # Allow to manually trigger the workflow - workflow_dispatch: - # Run it every day at 6:00 UTC - schedule: - - cron: '0 6 * * *' -jobs: - updater: - runs-on: ubuntu-latest - steps: - - name: Fetch the source code - uses: actions/checkout@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: Run the updater script - id: run_updater - run: | - # Setting up Git user - git config --global user.name 'yunohost-bot' - git config --global user.email 'yunohost-bot@users.noreply.github.com' - # Run the updater script - /bin/bash .github/workflows/updater.sh - - name: Commit changes - id: commit - if: ${{ env.PROCEED == 'true' }} - run: | - git commit -am "Upgrade to v$VERSION" - - name: Create Pull Request - id: cpr - if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update to version ${{ env.VERSION }} - committer: 'yunohost-bot ' - author: 'yunohost-bot ' - signoff: false - base: testing - branch: ci-auto-update-v${{ env.VERSION }} - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - [See upstream release page](https://github.com/${{ env.REPO }}/releases/tag/v${{ env.VERSION }}) - draft: false From 83c2f8ce4d32b27e58f24b10adf7a5719532cc81 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 16 Sep 2023 10:17:32 +0200 Subject: [PATCH 095/104] Fix checksum --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 710a371..7802ee3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,7 +41,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [resources.sources.main] url = "https://github.com/ToolJet/ToolJet/archive/v2.16.1.tar.gz" - sha256 = "f3ba9112ba4afeabeda451ce302afb3fa431ba7f030702cc67457c37bc104a9" + sha256 = "f3ba9112ba4afeabeda451ce302afb3fa431ba7f030702cc67457c37bc104a9f" autoupdate.strategy = "latest_github_tag" From 728fd2ab146f72e76e88478c0af89938f59ffd1b Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 16 Sep 2023 11:03:21 +0200 Subject: [PATCH 096/104] Drop libpq-dev requirement --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7802ee3..336989b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -57,7 +57,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen main.default = 8095 [resources.apt] - packages = "postgresql, postgresql-contrib, libpq-dev" + packages = "postgresql, postgresql-contrib" [resources.database] type = "postgresql" From efddd869cf9e958b92d25661f8bcfd40e388689a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 16 Sep 2023 11:08:56 +0200 Subject: [PATCH 097/104] Ensure proper permissions --- scripts/install | 12 ++++++++---- scripts/restore | 6 +++++- scripts/upgrade | 12 ++++++++---- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index 63e8727..ca95e18 100755 --- a/scripts/install +++ b/scripts/install @@ -24,10 +24,6 @@ ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$install_dir" -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" - #================================================= # NGINX CONFIGURATION #================================================= @@ -55,6 +51,14 @@ pushd $install_dir ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build popd +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:$app "$install_dir" +chown $app:www-data -R "$install_dir/frontend/build" +chown $app:www-data "$install_dir/frontend/build" +chown $app:www-data "$install_dir/frontend" +chown $app:www-data "$install_dir" + #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index e06d7da..e70e686 100755 --- a/scripts/restore +++ b/scripts/restore @@ -28,7 +28,11 @@ ynh_restore_file --origin_path="$install_dir" chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +chown -R $app:$app "$install_dir" +chown $app:www-data -R "$install_dir/frontend/build" +chown $app:www-data "$install_dir/frontend/build" +chown $app:www-data "$install_dir/frontend" +chown $app:www-data "$install_dir" #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index 3d555e2..662e779 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -88,10 +88,6 @@ then ynh_setup_source --dest_dir="$install_dir" fi -chmod 750 "$install_dir" -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" - #================================================= # NGINX CONFIGURATION #================================================= @@ -126,6 +122,14 @@ pushd $install_dir ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build popd +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:$app "$install_dir" +chown $app:www-data -R "$install_dir/frontend/build" +chown $app:www-data "$install_dir/frontend/build" +chown $app:www-data "$install_dir/frontend" +chown $app:www-data "$install_dir" + #================================================= # UPDATE A CONFIG FILE #================================================= From 871f8ec740fc4f629343c95a24c85b87ab354a9e Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 16 Sep 2023 11:10:20 +0200 Subject: [PATCH 098/104] Upgrade script into packaging v2 --- scripts/upgrade | 63 ------------------------------------------------- 1 file changed, 63 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 662e779..3f3f680 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,49 +9,8 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? port=$(ynh_app_setting_get --app=$app --key=port) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? db_user=$db_name -#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) -#REMOVEME? lockbox_master_key=$(ynh_app_setting_get --app=$app --key=lockbox_master_key) -#REMOVEME? secret_key_base=$(ynh_app_setting_get --app=$app --key=secret_key_base) - -#================================================= -# CHECK VERSION -#================================================= - -### This helper will compare the version of the currently installed app and the version of the upstream package. -### $upgrade_type can have 2 different values -### - UPGRADE_APP if the upstream app version has changed -### - UPGRADE_PACKAGE if only the YunoHost package has changed -### ynh_check_app_version_changed will stop the upgrade if the app is up to date. -### UPGRADE_APP should be used to upgrade the core app only if there's an upgrade to do. upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 - -# Backup the current version of the app -#REMOVEME? ynh_backup_before_upgrade -#REMOVEME? ynh_clean_setup () { - # Restore it if the upgrade fails -#REMOVEME? ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -68,14 +27,6 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app # Nothing to do yet... -#================================================= -# CREATE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 - -# Create a dedicated user (if not existing) -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -96,13 +47,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=1 - -#REMOVEME? ynh_install_app_dependencies $pkg_dependencies - #================================================= # SPECIFIC UPGRADE #================================================= @@ -174,13 +118,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= From c4478cbbbc9838fbb4cfd7739e7111ce75c95f9c Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 16 Sep 2023 11:13:33 +0200 Subject: [PATCH 099/104] Improve .env file --- conf/.env.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index 086231b..b4d7b7e 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -1,7 +1,7 @@ # Create .env from this example file and replace values for the environment. # The application expects a separate .env.test for test environment configuration -TOOLJET_HOST=http://127.0.0.1:__PORT__ +TOOLJET_HOST=https://__DOMAIN____PATH__ LOCKBOX_MASTER_KEY=__LOCKBOX_MASTER_KEY__ SECRET_KEY_BASE=__SECRET_KEY_BASE__ PORT=__PORT__ @@ -16,7 +16,7 @@ PG_HOST=localhost PG_PASS=__DB_PWD__ # Checks every 24 hours to see if a new version of ToolJet is available -CHECK_FOR_UPDATES=check_if_updates_are_available +CHECK_FOR_UPDATES=0 # EMAIL CONFIGURATION DEFAULT_FROM_EMAIL=__APP__@__DOMAIN__ From 65d865b9dac4b6d95e27726e1b1aca78247c2ba6 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 16 Sep 2023 12:05:58 +0200 Subject: [PATCH 100/104] Ensure proper permissions for building the app --- scripts/install | 4 ++++ scripts/upgrade | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/scripts/install b/scripts/install index ca95e18..11a984d 100755 --- a/scripts/install +++ b/scripts/install @@ -24,6 +24,10 @@ ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:$app "$install_dir" + #================================================= # NGINX CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3f3f680..f84c432 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -39,6 +39,10 @@ then ynh_setup_source --dest_dir="$install_dir" fi +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:$app "$install_dir" + #================================================= # NGINX CONFIGURATION #================================================= From 2cf0525c95479047f83902357cfe3ac224685c56 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 16 Sep 2023 13:50:37 +0200 Subject: [PATCH 101/104] Update manifest.toml --- manifest.toml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/manifest.toml b/manifest.toml index 336989b..7e35b78 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,15 +19,14 @@ cpe = "cpe:2.3:a:tooljet:tooljet" yunohost = ">= 11.2" architectures = "all" multi_instance = true -ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. -sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. -disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... -ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... -ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +ldap = false +sso = false +disk = "3G" +ram.build = "3G" +ram.runtime = "300M" [install] [install.domain] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "domain" full_domain = true From 7851502ad0843e9c6eb3cf69aaaf525d98c25788 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 16 Sep 2023 14:01:45 +0200 Subject: [PATCH 102/104] Cleanup to save disk space --- scripts/install | 6 ++++++ scripts/upgrade | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/scripts/install b/scripts/install index 11a984d..2f37431 100755 --- a/scripts/install +++ b/scripts/install @@ -55,6 +55,12 @@ pushd $install_dir ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build popd +# Cleanup after install +ynh_secure_remove --file="$install_dir/.cache" +ynh_secure_remove --file="$install_dir/.npm/_cacache" +ynh_secure_remove --file="$install_dir/node_modules" +ynh_secure_remove --file="$install_dir/frontend/node_modules" + chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:$app "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index f84c432..186b1ad 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,6 +43,12 @@ chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:$app "$install_dir" +# Cleanup after install +ynh_secure_remove --file="$install_dir/.cache" +ynh_secure_remove --file="$install_dir/.npm/_cacache" +ynh_secure_remove --file="$install_dir/node_modules" +ynh_secure_remove --file="$install_dir/frontend/node_modules" + #================================================= # NGINX CONFIGURATION #================================================= From 1c9203a5a8c328714280128fd837e9138b11c03e Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 16 Sep 2023 14:04:49 +0200 Subject: [PATCH 103/104] Make sure HTML files are properly served --- conf/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index b8a06e8..27bca35 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,6 +1,7 @@ location / { # Path to source root __INSTALL_DIR__/frontend/build/; + default_type text/html; try_files $uri $uri/ /index.html @proxy; error_page 405 @proxy; From 2d772365d278809dec6b1c95e7edd8d0fcf7f4ed Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 16 Sep 2023 14:19:00 +0200 Subject: [PATCH 104/104] Appease npm warning --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 2f37431..96fb607 100755 --- a/scripts/install +++ b/scripts/install @@ -49,7 +49,7 @@ pushd $install_dir # The version shipped by default with n does not work, there is a # weird dependency issue about unsupported platform and fsevent. # See https://github.com/ToolJet/ToolJet/pull/1752 - $ynh_npm install -g npm@"$NPM_VERSION" + $ynh_npm install npm@"$NPM_VERSION" --location=global ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install -f ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build diff --git a/scripts/upgrade b/scripts/upgrade index 186b1ad..0908be5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,7 +70,7 @@ pushd $install_dir # The version shipped by default with n does not work, there is a # wierd dependency issue about unsupported platform and fsevent. # See https://github.com/ToolJet/ToolJet/pull/1752 - $ynh_npm install -g npm@"$NPM_VERSION" + $ynh_npm install npm@"$NPM_VERSION" --location=global ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install -f ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build