From 26c6c087f87cfdd6437bc7a4c78f095c0ea84a96 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 17 Mar 2024 10:46:40 +0000 Subject: [PATCH 01/25] Auto-update README --- README.md | 19 +++++++++---------- README_fr.md | 21 ++++++++++----------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 429e3a3..4606be2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -31,10 +31,9 @@ This Yunohost app installs the server part (services + mongo database) needed to - Projects and all user's data are backuped up as part of the Yunohost backup process - As well any documents or images uploaded by users will be backed up - **Shipped version:** 0.2.10~ynh6 -**Demo:** https://dont-code.net/apps.html +**Demo:** ## Screenshots @@ -43,12 +42,12 @@ This Yunohost app installs the server part (services + mongo database) needed to ## Documentation and resources -* Official app website: -* Official user documentation: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official user documentation: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info @@ -56,7 +55,7 @@ Please send your pull request to the [testing branch](https://github.com/YunoHos To try the testing branch, please proceed like that. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug or sudo yunohost app upgrade dont-code -u https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug diff --git a/README_fr.md b/README_fr.md index e1d8194..f7f7d3d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ @@ -31,10 +31,9 @@ This Yunohost app installs the server part (services + mongo database) needed to - Projects and all user's data are backuped up as part of the Yunohost backup process - As well any documents or images uploaded by users will be backed up - **Version incluse :** 0.2.10~ynh6 -**Démo :** https://dont-code.net/apps.html +**Démo :** ## Captures d’écran @@ -43,12 +42,12 @@ This Yunohost app installs the server part (services + mongo database) needed to ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle utilisateur : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle utilisateur : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs @@ -56,10 +55,10 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour essayer la branche testing, procédez comme suit. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug ou sudo yunohost app upgrade dont-code -u https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** From 1a7cc785f8bd7a76b57902f93e0c7d064663e77b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Sun, 17 Mar 2024 11:50:08 +0100 Subject: [PATCH 02/25] Upgrade version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e36f4da..cf9eb4a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Dont-code Services" description.en = "Install services and databases needed to support Dont-code platform" description.fr = "Installe les services et base de données nécessaires pour utiliser la plateforme Dont-code" -version = "0.2.10~ynh6" +version = "0.2.10~ynh7" maintainers = ["Dont-code Team"] From 13b9ba1eb3ccad38329ee2c7dadad00c18fe5e83 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 17 Mar 2024 10:50:11 +0000 Subject: [PATCH 03/25] 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 4606be2..5b73827 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - Projects and all user's data are backuped up as part of the Yunohost backup process - As well any documents or images uploaded by users will be backed up -**Shipped version:** 0.2.10~ynh6 +**Shipped version:** 0.2.10~ynh7 **Demo:** diff --git a/README_fr.md b/README_fr.md index f7f7d3d..f706ce4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - Projects and all user's data are backuped up as part of the Yunohost backup process - As well any documents or images uploaded by users will be backed up -**Version incluse :** 0.2.10~ynh6 +**Version incluse :** 0.2.10~ynh7 **Démo :** From 10abfa8ebb36e3346987347460b9370495e6d5a7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 29 Mar 2024 07:00:42 +0100 Subject: [PATCH 04/25] Auto-update README --- ALL_README.md | 6 +++++ README.md | 13 ++++++----- README_fr.md | 33 +++++++++++++------------- README_gl.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ README_it.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 160 insertions(+), 22 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_gl.md create mode 100644 README_it.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..3d6c579 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,6 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [Leggi il “README” in italiano](README_it.md) diff --git a/README.md b/README.md index 5b73827..e485bd7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Dont-code Services with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dont-code) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README is other languages.](./ALL_README.md)* -> *This package allows you to install Dont-code Services quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install Dont-code Services quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview @@ -31,6 +31,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - Projects and all user's data are backuped up as part of the Yunohost backup process - As well any documents or images uploaded by users will be backed up + **Shipped version:** 0.2.10~ynh7 **Demo:** @@ -51,9 +52,9 @@ This Yunohost app installs the server part (services + mongo database) needed to ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: ```bash sudo yunohost app install https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug diff --git a/README_fr.md b/README_fr.md index f706ce4..5b05281 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Dont-code Services pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Installer Dont-code Services avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dont-code) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Dont-code Services 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 Dont-code Services rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble @@ -31,9 +31,10 @@ This Yunohost app installs the server part (services + mongo database) needed to - Projects and all user's data are backuped up as part of the Yunohost backup process - As well any documents or images uploaded by users will be backed up -**Version incluse :** 0.2.10~ynh7 -**Démo :** +**Version incluse :** 0.2.10~ynh7 + +**Démo :** ## Captures d’écran @@ -42,18 +43,18 @@ This Yunohost app installs the server part (services + mongo database) needed to ## Documentations et ressources -- Site officiel de l’app : -- Documentation officielle utilisateur : -- Documentation officielle de l’admin : -- Dépôt de code officiel de l’app : -- YunoHost Store : -- Signaler un bug : +- Site officiel de l’app : +- Documentation officielle utilisateur : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : ```bash sudo yunohost app install https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug @@ -61,4 +62,4 @@ ou sudo yunohost app upgrade dont-code -u https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..455b5cb --- /dev/null +++ b/README_gl.md @@ -0,0 +1,65 @@ + + +# Dont-code Services para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/dont-code.svg)](https://dash.yunohost.org/appci/app/dont-code) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/dont-code.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/dont-code.maintain.svg) + +[![Instalar Dont-code Services con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dont-code) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Dont-code Services de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +Dont-code is a low-code / no-code platform letting user create their own applications based on complete feature sets developed by IT. +You can find more information here: https://dont-code.net + +This Yunohost app installs the server part (services + mongo database) needed to run the dont-code applications. + +### Features + +- Thanks to the Powerful [Builders](https://dont-code.net/ide-ui) and [Previewers](https://dont-code.net/ide-ui), a user can directly design its application and immediately see the result +- One only needs to describe its application by filling sentences prepared by the platform. +- By default it provides support for images, currency, text, numbers, countries, links. +- Multiple plugins allow you to list, edit, make reports, call services, save to database, save in browser, and so on... +- Plugins can be developed by any IT team +- Projects and all user's data are backuped up as part of the Yunohost backup process +- As well any documents or images uploaded by users will be backed up + + +**Versión proporcionada:** 0.2.10~ynh7 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de Dont-code Services](./doc/screenshots/previewer.gif) +![Captura de pantalla de Dont-code Services](./doc/screenshots/ide.gif) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para usuarias: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug +ou +sudo yunohost app upgrade dont-code -u https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_it.md b/README_it.md new file mode 100644 index 0000000..b00b138 --- /dev/null +++ b/README_it.md @@ -0,0 +1,65 @@ + + +# Dont-code Services per YunoHost + +[![Livello di integrazione](https://dash.yunohost.org/integration/dont-code.svg)](https://dash.yunohost.org/appci/app/dont-code) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/dont-code.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/dont-code.maintain.svg) + +[![Installa Dont-code Services con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dont-code) + +*[Leggi questo README in altre lingue.](./ALL_README.md)* + +> *Questo pacchetto ti permette di installare Dont-code Services su un server YunoHost in modo semplice e veloce.* +> *Se non hai YunoHost, consulta [la guida](https://yunohost.org/install) per imparare a installarlo.* + +## Panoramica + +Dont-code is a low-code / no-code platform letting user create their own applications based on complete feature sets developed by IT. +You can find more information here: https://dont-code.net + +This Yunohost app installs the server part (services + mongo database) needed to run the dont-code applications. + +### Features + +- Thanks to the Powerful [Builders](https://dont-code.net/ide-ui) and [Previewers](https://dont-code.net/ide-ui), a user can directly design its application and immediately see the result +- One only needs to describe its application by filling sentences prepared by the platform. +- By default it provides support for images, currency, text, numbers, countries, links. +- Multiple plugins allow you to list, edit, make reports, call services, save to database, save in browser, and so on... +- Plugins can be developed by any IT team +- Projects and all user's data are backuped up as part of the Yunohost backup process +- As well any documents or images uploaded by users will be backed up + + +**Versione pubblicata:** 0.2.10~ynh7 + +**Prova:** + +## Screenshot + +![Screenshot di Dont-code Services](./doc/screenshots/previewer.gif) +![Screenshot di Dont-code Services](./doc/screenshots/ide.gif) + +## Documentazione e risorse + +- Sito web ufficiale dell’app: +- Documentazione ufficiale per gli utenti: +- Documentazione ufficiale per gli amministratori: +- Repository upstream del codice dell’app: +- Store di YunoHost: +- Segnala un problema: + +## Informazioni per sviluppatori + +Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing). + +Per provare la branch di `testing`, si prega di procedere in questo modo: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug +o +sudo yunohost app upgrade dont-code -u https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug +``` + +**Maggiori informazioni riguardo il pacchetto di quest’app:** From ebb2bf66d0ed8d920e3a102fcfd02ecbf7d9c49f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Mon, 1 Apr 2024 11:42:02 +0200 Subject: [PATCH 05/25] v.0.3.1 & Multitenant & secured mongo access --- conf/.env | 10 ++++------ conf/nginx.conf | 7 ------- manifest.toml | 14 ++++++++++---- scripts/_common.sh | 2 +- scripts/backup | 4 ++-- scripts/install | 8 +++++--- scripts/remove | 2 +- scripts/restore | 5 ++--- scripts/upgrade | 31 +++++++++++++++++++++++-------- tests.toml | 1 + 10 files changed, 49 insertions(+), 35 deletions(-) diff --git a/conf/.env b/conf/.env index 32f4820..a02d9d5 100644 --- a/conf/.env +++ b/conf/.env @@ -1,9 +1,7 @@ quarkus_http_host=127.0.0.1 - -quarkus_mongodb_projects_connection_string=mongodb://localhost:27017 -projects_database_name=dontCodeProjects - -quarkus_mongodb_data_connection_string=mongodb://localhost:27017 -data_database_name=dontCodeData +quarkus_mongodb_projects_connection_string=mongodb://__DB_USER__:__DB_PWD__@localhost:27017/?authSource=dontCode__TENANT__Projects +projects_database_name=dontCode__TENANT__Projects +quarkus_mongodb_data_connection_string=mongodb://__DB_USER__:__DB_PWD__@localhost:27017/?authSource=dontCode__TENANT__Data +data_database_name=dontCode__TENANT__Data document_directory=__DOCUMENT_DIR__ document_external_url=__DOCUMENT_URL__ diff --git a/conf/nginx.conf b/conf/nginx.conf index ccbfa21..08fe1a6 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -50,11 +50,4 @@ location __PATH__/ { client_max_body_size 15M; } - location __PATH__/demo_project { - proxy_pass http://localhost:__PORT_PROJECT__/project; - proxy_set_header Host $host; - proxy_set_header DbName "dontCodeDemoProjects"; - proxy_read_timeout 86400s; - proxy_send_timeout 86400s; - } } diff --git a/manifest.toml b/manifest.toml index e36f4da..6173aeb 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Dont-code Services" description.en = "Install services and databases needed to support Dont-code platform" description.fr = "Installe les services et base de données nécessaires pour utiliser la plateforme Dont-code" -version = "0.2.10~ynh6" +version = "0.3.1~ynh1" maintainers = ["Dont-code Team"] @@ -22,7 +22,7 @@ code = "https://github.com/dont-code" [integration] yunohost = ">= 11.0.0" architectures = "all" -multi_instance = false +multi_instance = true ldap = false sso = false disk = "50M" @@ -39,6 +39,12 @@ ram.runtime = "400M" type = "path" default = "/dont-code" + [install.tenant] + ask.en = "The name of the tenant these services will support. This configures database name to use. Can be empty if non necessary." + ask.fr = "Le nom du tenant associé a ces services. Permet de configurer une base de donnée séparée. Peut-être vide si non nécessaire." + type = "string" + optional = true + [install.public_key] ask.en = "SSH Public key to allow service updates as part of delivery process, leave empty to disable." ask.fr = "Clef publique SSH permettant la mise à jour des services via une deploiement automatique, inactif si non renseigné." @@ -51,8 +57,8 @@ ram.runtime = "400M" [resources] [resources.sources.main] - url = "https://github.com/dont-code/release/releases/download/v0.2.10/dont-code-release-runners.zip" - sha256 = "f20bfa0423d48015a3507b0555d30d57fa594657a4bca55ad869fca8fbad125d" + url = "https://github.com/dont-code/release/releases/download/v0.3.1/dont-code-release-runners.zip" + sha256 = "b69361f5383c904e30d551efd7a64cc155459af6a25e32fd5ca41633bcfb3658" in_subdir = false autoupdate.strategy = "latest_github_release" autoupdate.asset = "dont-code-release-runners.zip" diff --git a/scripts/_common.sh b/scripts/_common.sh index e4bf749..7ec06e1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,7 +10,7 @@ mongo_version=6.0 SERVICES_LIST=(ide preview project data) # List of Mongo databases to manage -MONGO_DB_LIST=(dontCodeProjects dontCodeDemoProjects dontCodeData dontCodeTestProjects) +MONGO_DB_LIST=(Projects Data) # The list of port in the same order than the list of services PORT_LIST=("$port_ide" "$port_preview" "$port_project" "$port_data") diff --git a/scripts/backup b/scripts/backup index 2a1f581..17f5883 100755 --- a/scripts/backup +++ b/scripts/backup @@ -63,11 +63,11 @@ fi ynh_print_info --message="Backing up the Mongo databases..." for db_name in "${MONGO_DB_LIST[@]}"; do - ynh_mongo_dump_db --database=$db_name > ./dump-${db_name}.bson + ynh_mongo_dump_db --database="dontCode$tenant$db_name" > ./dump-${tenant}${db_name}.bson done #================================================= # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info --message="Backup script completed for $app with tenant $tenant. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/install b/scripts/install index cf5fa2b..5823475 100755 --- a/scripts/install +++ b/scripts/install @@ -85,9 +85,11 @@ ynh_script_progression --message="Creating the Mongo databases..." --weight=1 db_user=$(ynh_sanitize_dbid --db_name="${app}") ynh_app_setting_set --app="$app" --key=db_user --value="$db_user" -# We should probably enable databases to the user, but for now, we connect through admin -# No need to create other databases: Mongo creates them on the fly -ynh_mongo_setup_db --db_user="$db_user" --db_name="${MONGO_DB_LIST[0]}" +# Let's create all databases needed, and assign them to the user + +for db_name in "${MONGO_DB_LIST[@]}"; do + ynh_mongo_setup_db --db_user="$db_user" --db_pwd="$db_pwd" --db_name="dontCode$tenant${db_name}" +done #================================================= # SYSTEM CONFIGURATION diff --git a/scripts/remove b/scripts/remove index ea1a6aa..a62bb13 100755 --- a/scripts/remove +++ b/scripts/remove @@ -36,7 +36,7 @@ ynh_remove_logrotate # Remove a database if it exists, along with the associated user for db_name in "${MONGO_DB_LIST[@]}"; do - ynh_mongo_remove_db --db_user=$db_user --db_name=$db_name + ynh_mongo_remove_db --db_user=$db_user --db_name="dontCode$tenant$db_name" done # Remove mongo itself if not used anymore diff --git a/scripts/restore b/scripts/restore index 1532db5..e17595e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -64,10 +64,9 @@ ynh_install_mongo --mongo_version=$mongo_version #================================================= ynh_script_progression --message="Restoring the Mongo databases..." --weight=1 -ynh_mongo_setup_db --db_user=$db_user --db_name=${MONGO_DB_LIST[0]} --db_pwd=$db_pwd - for db_name in "${MONGO_DB_LIST[@]}"; do - ynh_mongo_restore_db --database="$db_name" < "./dump-${db_name}.bson" + ynh_mongo_setup_db --db_user="$db_user" --db_pwd="$db_pwd" --db_name="dontCode$tenant${db_name}" + ynh_mongo_restore_db --database="dontCode$tenant$db_name" < "./dump-${tenant}${db_name}.bson" done #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b83df55..8b3041e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -34,6 +34,13 @@ if [ -z "${public_key+x}" ]; then ynh_app_setting_set --app="$app" --key=public_key --value="$public_key" fi +# Set default tenant to empty if needed +if [ -z "${tenant+x}" ]; then + tenant="" + ynh_app_setting_set --app="$app" --key=tenant --value="$tenant" +fi + + if [[ -n "${document_path:-}" ]]; then # Renamed setting key document_dir="$document_path" @@ -66,7 +73,7 @@ if [[ -n "${html_path:-}" ]]; then fi -# Regenerate the .env file if the document_url was incorrectly set before +# Recalculate the document_url if it was incorrectly set before correct_document_url=$(append_uri "https://${domain}${path}" "docs") if [ "$correct_document_url" != "$document_url" ]; then ynh_script_progression --message="Updading url for documents" --weight=1 @@ -74,13 +81,6 @@ if [ "$correct_document_url" != "$document_url" ]; then document_url=$correct_document_url ynh_app_setting_set --app=$app --key=document_url --value=$document_url - ynh_add_config --template=".env" --destination="$install_dir/.env" - - # FIXME: this should be handled by the core in the future - # You may need to use chmod 600 instead of 400, - # for example if the app is expected to be able to modify its own config - chmod 400 "$install_dir/.env" - chown $app:$app "$install_dir/.env" fi #================================================= @@ -92,6 +92,16 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]; then # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep ".env .ssh/authorized_keys restart_services.sh" + + # Always update .env + ynh_add_config --template=".env" --destination="$install_dir/.env" + + # FIXME: this should be handled by the core in the future + # You may need to use chmod 600 instead of 400, + # for example if the app is expected to be able to modify its own config + chmod 400 "$install_dir/.env" + chown $app:$app "$install_dir/.env" + fi chmod -R o-rwx "$install_dir" @@ -124,6 +134,11 @@ ynh_script_progression --message="Upgrading MongoDB..." --weight=1 # Install the required version of Mongo ynh_install_mongo --mongo_version=$mongo_version +# We are now assigning the user to the database, so update the user's rights +for db_name in "${MONGO_DB_LIST[@]}"; do + ynh_mongo_setup_db --db_user="$db_user" --db_pwd="$db_pwd" --db_name="dontCode$tenant${db_name}" +done + #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= diff --git a/tests.toml b/tests.toml index 77f10a9..441f9db 100644 --- a/tests.toml +++ b/tests.toml @@ -11,4 +11,5 @@ test_format = 1.0 test_upgrade_from.7852cc4bf44ff20ee51fe35f3f53dc105e0f6d79.name= "2023-01-07 - Added Ssh support for dev." test_upgrade_from.e89eebdac9f59202202d07972e274ebe6fc7c51c.name= "Before Manifest v2." + test_upgrade_from.13b9ba1eb3ccad38329ee2c7dadad00c18fe5e83.name= "Switching to multi_instance." \ No newline at end of file From d106d21e849edea25a1ff816a17ac5c50da92d7d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 1 Apr 2024 09:42:11 +0000 Subject: [PATCH 06/25] Auto-update READMEs --- ALL_README.md | 5 ++++ README.md | 30 ++++++++++++------------ README_eu.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 34 +++++++++++++-------------- 4 files changed, 102 insertions(+), 32 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..3eeb161 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,5 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) diff --git a/README.md b/README.md index 429e3a3..7cfbac4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Dont-code Services with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dont-code) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Dont-code Services quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install Dont-code Services quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview @@ -32,9 +32,9 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Shipped version:** 0.2.10~ynh6 +**Shipped version:** 0.3.1~ynh1 -**Demo:** https://dont-code.net/apps.html +**Demo:** ## Screenshots @@ -43,20 +43,20 @@ This Yunohost app installs the server part (services + mongo database) needed to ## Documentation and resources -* Official app website: -* Official user documentation: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official user documentation: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug or sudo yunohost app upgrade dont-code -u https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..33374c3 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,65 @@ + + +# Dont-code Services YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/dont-code.svg)](https://dash.yunohost.org/appci/app/dont-code) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/dont-code.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/dont-code.maintain.svg) + +[![Instalatu Dont-code Services YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dont-code) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Dont-code Services YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Dont-code is a low-code / no-code platform letting user create their own applications based on complete feature sets developed by IT. +You can find more information here: https://dont-code.net + +This Yunohost app installs the server part (services + mongo database) needed to run the dont-code applications. + +### Features + +- Thanks to the Powerful [Builders](https://dont-code.net/ide-ui) and [Previewers](https://dont-code.net/ide-ui), a user can directly design its application and immediately see the result +- One only needs to describe its application by filling sentences prepared by the platform. +- By default it provides support for images, currency, text, numbers, countries, links. +- Multiple plugins allow you to list, edit, make reports, call services, save to database, save in browser, and so on... +- Plugins can be developed by any IT team +- Projects and all user's data are backuped up as part of the Yunohost backup process +- As well any documents or images uploaded by users will be backed up + + +**Paketatutako bertsioa:** 0.3.1~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Dont-code Services(r)en pantaila-argazkia](./doc/screenshots/previewer.gif) +![Dont-code Services(r)en pantaila-argazkia](./doc/screenshots/ide.gif) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Erabiltzaileen dokumentazio ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug +edo +sudo yunohost app upgrade dont-code -u https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index e1d8194..174e646 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Dont-code Services pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Installer Dont-code Services avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dont-code) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Dont-code Services 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 Dont-code Services rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble @@ -32,9 +32,9 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Version incluse :** 0.2.10~ynh6 +**Version incluse :** 0.3.1~ynh1 -**Démo :** https://dont-code.net/apps.html +**Démo :** ## Captures d’écran @@ -43,23 +43,23 @@ This Yunohost app installs the server part (services + mongo database) needed to ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle utilisateur : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle utilisateur : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug ou sudo yunohost app upgrade dont-code -u https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** From 9048fe65f867236eaef7b5b0d6cbf4ba2083fc5a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 1 Apr 2024 09:45:33 +0000 Subject: [PATCH 07/25] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f49fdb1..7cfbac4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install Dont-code Services with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dont-code) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *This package allows you to install Dont-code Services quickly and simply on a YunoHost server.* > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* From 2fe6b4841e785f32f0198b16cd82dd0a455ed2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Mon, 1 Apr 2024 11:50:43 +0200 Subject: [PATCH 08/25] Adding tenant to test --- tests.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 441f9db..0b8169d 100644 --- a/tests.toml +++ b/tests.toml @@ -5,11 +5,12 @@ test_format = 1.0 [default] args.public_key = "" + args.tenant = "Test" # ------------------------------- # Commits to test upgrade from # ------------------------------- test_upgrade_from.7852cc4bf44ff20ee51fe35f3f53dc105e0f6d79.name= "2023-01-07 - Added Ssh support for dev." test_upgrade_from.e89eebdac9f59202202d07972e274ebe6fc7c51c.name= "Before Manifest v2." - test_upgrade_from.13b9ba1eb3ccad38329ee2c7dadad00c18fe5e83.name= "Switching to multi_instance." + test_upgrade_from.13b9ba1eb3ccad38329ee2c7dadad00c18fe5e83.name= "Before switching to multi_instance." \ No newline at end of file From 70f623709d0fb577f80195a6f738cbf142eceb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Mon, 1 Apr 2024 14:15:56 +0200 Subject: [PATCH 09/25] generate db_pwd if needed --- scripts/install | 3 +++ scripts/upgrade | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 5823475..fe62ed1 100755 --- a/scripts/install +++ b/scripts/install @@ -86,6 +86,9 @@ db_user=$(ynh_sanitize_dbid --db_name="${app}") ynh_app_setting_set --app="$app" --key=db_user --value="$db_user" # Let's create all databases needed, and assign them to the user +local new_db_pwd=$(ynh_string_random) # Generate a random password + # If $db_pwd is not provided, use new_db_pwd instead for db_pwd +db_pwd="${db_pwd:-$new_db_pwd}" for db_name in "${MONGO_DB_LIST[@]}"; do ynh_mongo_setup_db --db_user="$db_user" --db_pwd="$db_pwd" --db_name="dontCode$tenant${db_name}" diff --git a/scripts/upgrade b/scripts/upgrade index 8b3041e..24557f9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,7 +40,6 @@ if [ -z "${tenant+x}" ]; then ynh_app_setting_set --app="$app" --key=tenant --value="$tenant" fi - if [[ -n "${document_path:-}" ]]; then # Renamed setting key document_dir="$document_path" @@ -134,6 +133,10 @@ ynh_script_progression --message="Upgrading MongoDB..." --weight=1 # Install the required version of Mongo ynh_install_mongo --mongo_version=$mongo_version +local new_db_pwd=$(ynh_string_random) # Generate a random password + # If $db_pwd is not provided, use new_db_pwd instead for db_pwd +db_pwd="${db_pwd:-$new_db_pwd}" + # We are now assigning the user to the database, so update the user's rights for db_name in "${MONGO_DB_LIST[@]}"; do ynh_mongo_setup_db --db_user="$db_user" --db_pwd="$db_pwd" --db_name="dontCode$tenant${db_name}" From db2dc428637b5139b7dc76a41a52246e1f20d283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Mon, 1 Apr 2024 14:28:27 +0200 Subject: [PATCH 10/25] db_password issue --- scripts/install | 10 +++++----- scripts/upgrade | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index fe62ed1..040cc90 100755 --- a/scripts/install +++ b/scripts/install @@ -46,6 +46,11 @@ chown -R $app:www-data "$data_dir" #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 +# Let's create all databases needed, and assign them to the user +local new_db_pwd=$(ynh_string_random) # Generate a random password + # If $db_pwd is not provided, use new_db_pwd instead for db_pwd +db_pwd="${db_pwd:-$new_db_pwd}" + ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" @@ -85,11 +90,6 @@ ynh_script_progression --message="Creating the Mongo databases..." --weight=1 db_user=$(ynh_sanitize_dbid --db_name="${app}") ynh_app_setting_set --app="$app" --key=db_user --value="$db_user" -# Let's create all databases needed, and assign them to the user -local new_db_pwd=$(ynh_string_random) # Generate a random password - # If $db_pwd is not provided, use new_db_pwd instead for db_pwd -db_pwd="${db_pwd:-$new_db_pwd}" - for db_name in "${MONGO_DB_LIST[@]}"; do ynh_mongo_setup_db --db_user="$db_user" --db_pwd="$db_pwd" --db_name="dontCode$tenant${db_name}" done diff --git a/scripts/upgrade b/scripts/upgrade index 24557f9..b53201e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,6 +40,10 @@ if [ -z "${tenant+x}" ]; then ynh_app_setting_set --app="$app" --key=tenant --value="$tenant" fi +local new_db_pwd=$(ynh_string_random) # Generate a random password + # If $db_pwd is not provided, use new_db_pwd instead for db_pwd +db_pwd="${db_pwd:-$new_db_pwd}" + if [[ -n "${document_path:-}" ]]; then # Renamed setting key document_dir="$document_path" @@ -133,10 +137,6 @@ ynh_script_progression --message="Upgrading MongoDB..." --weight=1 # Install the required version of Mongo ynh_install_mongo --mongo_version=$mongo_version -local new_db_pwd=$(ynh_string_random) # Generate a random password - # If $db_pwd is not provided, use new_db_pwd instead for db_pwd -db_pwd="${db_pwd:-$new_db_pwd}" - # We are now assigning the user to the database, so update the user's rights for db_name in "${MONGO_DB_LIST[@]}"; do ynh_mongo_setup_db --db_user="$db_user" --db_pwd="$db_pwd" --db_name="dontCode$tenant${db_name}" From 29526f4d0cc2f765a0df459025f7ccf2f89d192d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Mon, 1 Apr 2024 14:44:15 +0200 Subject: [PATCH 11/25] no local in script --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 040cc90..b3ad97a 100755 --- a/scripts/install +++ b/scripts/install @@ -47,7 +47,7 @@ chown -R $app:www-data "$data_dir" ynh_script_progression --message="Adding a configuration file..." --weight=1 # Let's create all databases needed, and assign them to the user -local new_db_pwd=$(ynh_string_random) # Generate a random password +new_db_pwd=$(ynh_string_random) # Generate a random password # If $db_pwd is not provided, use new_db_pwd instead for db_pwd db_pwd="${db_pwd:-$new_db_pwd}" diff --git a/scripts/upgrade b/scripts/upgrade index b53201e..2d68f78 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,7 +40,7 @@ if [ -z "${tenant+x}" ]; then ynh_app_setting_set --app="$app" --key=tenant --value="$tenant" fi -local new_db_pwd=$(ynh_string_random) # Generate a random password +new_db_pwd=$(ynh_string_random) # Generate a random password # If $db_pwd is not provided, use new_db_pwd instead for db_pwd db_pwd="${db_pwd:-$new_db_pwd}" From de87924afbdc8ea1543a502bab43a24c0116fdb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Mon, 1 Apr 2024 15:03:51 +0200 Subject: [PATCH 12/25] db_user is needed as well --- scripts/install | 9 ++++----- scripts/upgrade | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index b3ad97a..b6a9c5a 100755 --- a/scripts/install +++ b/scripts/install @@ -46,11 +46,13 @@ chown -R $app:www-data "$data_dir" #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -# Let's create all databases needed, and assign them to the user +# The .env needs db_user and db_password new_db_pwd=$(ynh_string_random) # Generate a random password - # If $db_pwd is not provided, use new_db_pwd instead for db_pwd db_pwd="${db_pwd:-$new_db_pwd}" +db_user=$(ynh_sanitize_dbid --db_name="${app}") +ynh_app_setting_set --app="$app" --key=db_user --value="$db_user" + ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" @@ -87,9 +89,6 @@ ynh_install_mongo --mongo_version=$mongo_version #================================================= ynh_script_progression --message="Creating the Mongo databases..." --weight=1 -db_user=$(ynh_sanitize_dbid --db_name="${app}") -ynh_app_setting_set --app="$app" --key=db_user --value="$db_user" - for db_name in "${MONGO_DB_LIST[@]}"; do ynh_mongo_setup_db --db_user="$db_user" --db_pwd="$db_pwd" --db_name="dontCode$tenant${db_name}" done diff --git a/scripts/upgrade b/scripts/upgrade index 2d68f78..29459ed 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,8 +40,8 @@ if [ -z "${tenant+x}" ]; then ynh_app_setting_set --app="$app" --key=tenant --value="$tenant" fi +# The .env needs db_password new_db_pwd=$(ynh_string_random) # Generate a random password - # If $db_pwd is not provided, use new_db_pwd instead for db_pwd db_pwd="${db_pwd:-$new_db_pwd}" if [[ -n "${document_path:-}" ]]; then From dba904d7ed9c752a282dd8c81bc9fc13b135a385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Thu, 4 Apr 2024 11:26:21 +0200 Subject: [PATCH 13/25] Cleandup mongo bkp file names --- scripts/backup | 2 +- scripts/restore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/backup b/scripts/backup index 17f5883..5f79d19 100755 --- a/scripts/backup +++ b/scripts/backup @@ -63,7 +63,7 @@ fi ynh_print_info --message="Backing up the Mongo databases..." for db_name in "${MONGO_DB_LIST[@]}"; do - ynh_mongo_dump_db --database="dontCode$tenant$db_name" > ./dump-${tenant}${db_name}.bson + ynh_mongo_dump_db --database="dontCode$tenant$db_name" > ./dump-dontCode${tenant}${db_name}.bson done #================================================= diff --git a/scripts/restore b/scripts/restore index e17595e..7d8cc88 100755 --- a/scripts/restore +++ b/scripts/restore @@ -66,7 +66,7 @@ ynh_script_progression --message="Restoring the Mongo databases..." --weight=1 for db_name in "${MONGO_DB_LIST[@]}"; do ynh_mongo_setup_db --db_user="$db_user" --db_pwd="$db_pwd" --db_name="dontCode$tenant${db_name}" - ynh_mongo_restore_db --database="dontCode$tenant$db_name" < "./dump-${tenant}${db_name}.bson" + ynh_mongo_restore_db --database="dontCode$tenant$db_name" < "./dump-dontCode${tenant}${db_name}.bson" done #================================================= From a36c0788b392815f2b258834113548273bc02965 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 4 Apr 2024 09:26:28 +0000 Subject: [PATCH 14/25] Auto-update READMEs --- ALL_README.md | 1 + README_gl.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ALL_README.md b/ALL_README.md index 3eeb161..77b7509 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -3,3 +3,4 @@ - [Read the README in English](README.md) - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) diff --git a/README_gl.md b/README_gl.md index 455b5cb..54bb600 100644 --- a/README_gl.md +++ b/README_gl.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Versión proporcionada:** 0.2.10~ynh7 +**Versión proporcionada:** 0.3.1~ynh1 **Demo:** From d2be1d61cecfaa206091ed7d9bbc2f5e3a1395d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Fri, 5 Apr 2024 18:33:54 +0200 Subject: [PATCH 15/25] Provide auto repositories --- conf/nginx.conf | 9 ++++++ conf/repository-next.json | 56 +++++++++++++++++++++++++++++++++++++ conf/repository-stable.json | 56 +++++++++++++++++++++++++++++++++++++ manifest.toml | 2 +- 4 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 conf/repository-next.json create mode 100644 conf/repository-stable.json diff --git a/conf/nginx.conf b/conf/nginx.conf index 08fe1a6..4f762ac 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,6 +2,15 @@ location __PATH__/ { + # CORS support + add_header Access-Control-Allow-Origin *; + + # Handling preflight requests + if ($request_method = OPTIONS) { + add_header Access-Control-Allow-Methods *; + add_header Access-Control-Allow-Headers *; + } + # Path to source alias __DATA_DIR__/; diff --git a/conf/repository-next.json b/conf/repository-next.json new file mode 100644 index 0000000..f63627d --- /dev/null +++ b/conf/repository-next.json @@ -0,0 +1,56 @@ + { + "$schema": "https://dont-code.net/schemas/v1/repository-schema.json", + "name": "Next Repository __TENANT__", + "description": "Repository provided by Dont-code offering next versions of all plugins", + "webSocketUrl": "ws://__DOMAIN____PATH__/preview", + "storeApiUrl": "https://__DOMAIN____PATH__/data", + "projectApiUrl": "https://__DOMAIN____PATH__/project", + "documentApiUrl": "https://__DOMAIN____PATH__/documents", + "plugins": [ + { + "id": "Basic", + "display-name": "Basic plugin for editing entities", + "version": "1.0.0", + "info": { + "remote-entry":"https://dont-code.net/plugins/next/remoteEntry.mjs" + }, + "config": {} + }, + { + "id": "Fields", + "display-name": "Additional editors for entity properties", + "version": "1.0.0", + "info": { + "remote-entry":"https://dont-code.net/plugins/next/remoteEntry.mjs" + }, + "config": {} + }, + { + "id": "Rest", + "display-name": "Plugins to support datasources from Rest API", + "version": "1.0.0", + "info": { + "remote-entry":"https://dont-code.net/plugin-rest/next/remoteEntry.mjs" + }, + "config": {} + }, + { + "id": "Report", + "display-name": "Plugins to generate and display reports", + "version": "1.0.0", + "info": { + "remote-entry":"https://dont-code.net/plugin-report/next/remoteEntry.mjs" + }, + "config": {} + }, + { + "id": "Commerce", + "display-name": "Plugins to get prices from shops", + "version": "1.0.0", + "info": { + "remote-entry":"https://dont-code.net/plugin-commerce/next/remoteEntry.mjs" + }, + "config": {} + } + ] +} diff --git a/conf/repository-stable.json b/conf/repository-stable.json new file mode 100644 index 0000000..a2d0c2a --- /dev/null +++ b/conf/repository-stable.json @@ -0,0 +1,56 @@ + { + "$schema": "https://dont-code.net/schemas/v1/repository-schema.json", + "name": "Stable Repository __TENANT__", + "description": "Repository provided by Dont-code using stable versions of plugins", + "webSocketUrl": "ws://__DOMAIN____PATH__/preview", + "storeApiUrl": "https://__DOMAIN____PATH__/data", + "projectApiUrl": "https://__DOMAIN____PATH__/project", + "documentApiUrl": "https://__DOMAIN____PATH__/documents", + "plugins": [ + { + "id": "Basic", + "display-name": "Basic plugin for editing entities", + "version": "1.0.0", + "info": { + "remote-entry":"https://dont-code.net/plugins/latest/remoteEntry.mjs" + }, + "config": {} + }, + { + "id": "Fields", + "display-name": "Additional editors for entity properties", + "version": "1.0.0", + "info": { + "remote-entry":"https://dont-code.net/plugins/latest/remoteEntry.mjs" + }, + "config": {} + }, + { + "id": "Rest", + "display-name": "Plugins to support datasources from Rest API", + "version": "1.0.0", + "info": { + "remote-entry":"https://dont-code.net/plugin-rest/latest/remoteEntry.mjs" + }, + "config": {} + }, + { + "id": "Report", + "display-name": "Plugins to generate and display reports", + "version": "1.0.0", + "info": { + "remote-entry":"https://dont-code.net/plugin-report/latest/remoteEntry.mjs" + }, + "config": {} + }, + { + "id": "Commerce", + "display-name": "Plugins to get prices from shops", + "version": "1.0.0", + "info": { + "remote-entry":"https://dont-code.net/plugin-commerce/latest/remoteEntry.mjs" + }, + "config": {} + } + ] +} diff --git a/manifest.toml b/manifest.toml index 6173aeb..270a846 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Dont-code Services" description.en = "Install services and databases needed to support Dont-code platform" description.fr = "Installe les services et base de données nécessaires pour utiliser la plateforme Dont-code" -version = "0.3.1~ynh1" +version = "0.3.1~ynh2" maintainers = ["Dont-code Team"] From 350e10a6442fb164abd76a595359df6e8e5ef9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Fri, 5 Apr 2024 18:34:23 +0200 Subject: [PATCH 16/25] Yes --- scripts/change_url | 4 ++++ scripts/install | 7 ++++++- scripts/upgrade | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/change_url b/scripts/change_url index 9aec754..139052a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -41,6 +41,10 @@ ynh_backup_if_checksum_is_different --file="$install_dir/.env" ynh_replace_string --match_string="$document_url" --replace_string="$new_document_url" --target_file="$install_dir/.env" ynh_store_file_checksum --file="$install_dir/.env" +# Update the repository pages +ynh_add_config --template="repository-next.json" --destination="$data_dir/repository-next.json" +ynh_add_config --template="repository-stable.json" --destination="$data_dir/repository-stable.json" + #================================================= # GENERIC FINALISATION #================================================= diff --git a/scripts/install b/scripts/install index b6a9c5a..3ba89bb 100755 --- a/scripts/install +++ b/scripts/install @@ -35,9 +35,14 @@ ynh_app_setting_set --app="$app" --key=document_dir --value="$document_dir" document_url=$(append_uri "https://${domain}${path}" "docs") ynh_app_setting_set --app="$app" --key=document_url --value="$document_url" -# Add the status page +# Add the status pageindex ynh_add_config --template="index.html" --destination="$data_dir/index.html" +# Add the repository pages +ynh_add_config --template="repository-next.json" --destination="$data_dir/repository-next.json" +ynh_add_config --template="repository-stable.json" --destination="$data_dir/repository-stable.json" + + chmod -R o-rwx "$data_dir" chown -R $app:www-data "$data_dir" diff --git a/scripts/upgrade b/scripts/upgrade index 29459ed..0a3e921 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -117,6 +117,10 @@ ynh_script_progression --message="Configuring document storage..." --weight=1 ynh_add_config --template="index.html" --destination="$data_dir/index.html" +# Add the repository pages +ynh_add_config --template="repository-next.json" --destination="$data_dir/repository-next.json" +ynh_add_config --template="repository-stable.json" --destination="$data_dir/repository-stable.json" + chmod -R o-rwx "$data_dir" chown -R "$app:www-data" "$data_dir" From 3c51c5c49cf2420d09b8e9b449627835118f501e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 5 Apr 2024 16:35:03 +0000 Subject: [PATCH 17/25] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7cfbac4..7eb2559 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Shipped version:** 0.3.1~ynh1 +**Shipped version:** 0.3.1~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index 33374c3..430ea44 100644 --- a/README_eu.md +++ b/README_eu.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Paketatutako bertsioa:** 0.3.1~ynh1 +**Paketatutako bertsioa:** 0.3.1~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 174e646..6d9e3c9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Version incluse :** 0.3.1~ynh1 +**Version incluse :** 0.3.1~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index 54bb600..75d5626 100644 --- a/README_gl.md +++ b/README_gl.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Versión proporcionada:** 0.3.1~ynh1 +**Versión proporcionada:** 0.3.1~ynh2 **Demo:** From c329babd1c33df1fe6f390ec906a97e3fdc38224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Sat, 6 Apr 2024 14:06:14 +0200 Subject: [PATCH 18/25] cors is managed by nginx only --- conf/.env | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/.env b/conf/.env index a02d9d5..17e7c11 100644 --- a/conf/.env +++ b/conf/.env @@ -1,4 +1,5 @@ quarkus_http_host=127.0.0.1 +quarkus_http_cors=false quarkus_mongodb_projects_connection_string=mongodb://__DB_USER__:__DB_PWD__@localhost:27017/?authSource=dontCode__TENANT__Projects projects_database_name=dontCode__TENANT__Projects quarkus_mongodb_data_connection_string=mongodb://__DB_USER__:__DB_PWD__@localhost:27017/?authSource=dontCode__TENANT__Data From 59d962436d8a53f6b3c9991b4297e1231eceb412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Sun, 7 Apr 2024 11:45:23 +0200 Subject: [PATCH 19/25] Cleaned up mongo install for bookworm --- manifest.toml | 2 +- scripts/ynh_mongo_db__2 | 20 ++++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/manifest.toml b/manifest.toml index 270a846..504c6ea 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Dont-code Services" description.en = "Install services and databases needed to support Dont-code platform" description.fr = "Installe les services et base de données nécessaires pour utiliser la plateforme Dont-code" -version = "0.3.1~ynh2" +version = "0.3.1~ynh3" maintainers = ["Dont-code Team"] diff --git a/scripts/ynh_mongo_db__2 b/scripts/ynh_mongo_db__2 index 6a69f62..3005e88 100644 --- a/scripts/ynh_mongo_db__2 +++ b/scripts/ynh_mongo_db__2 @@ -1,7 +1,7 @@ #!/bin/bash -readonly YNH_DEFAULT_MONGO_VERSION=4.4 -# Declare the actual MongoDB version to use: 4.4 ; 5.0 ; 6.0 +readonly YNH_DEFAULT_MONGO_VERSION=6.0 +# Declare the actual MongoDB version to use: 4.4 ; 5.0 ; 6.0 ; 7.0 # A packager willing to use another version of MongoDB can override the variable into its _common.sh. YNH_MONGO_VERSION=${YNH_MONGO_VERSION:-$YNH_DEFAULT_MONGO_VERSION} @@ -316,17 +316,13 @@ ynh_install_mongo() { local mongo_debian_release=$(ynh_get_debian_release) if [[ $(cat /proc/cpuinfo) != *"avx"* && "$mongo_version" != "4.4" ]]; then - #Sadly mongo 4.4 is the only version not requiring avx instruction set, so we will install it - ynh_print_warn --message="Installing Mongo 4.4 as $mongo_version is not compatible with your cpu (see https://docs.mongodb.com/manual/administration/production-notes/#x86_64)." - mongo_version="4.4" - fi - if [[ "$mongo_version" == "4.4" && "$mongo_debian_release" != "buster" ]]; then - ynh_print_warn --message="Switched to buster install as Mongo 4.4 is not compatible with $mongo_debian_release." - mongo_debian_release=buster - fi + #Sadly mongo 4.4 is the only version not requiring avx instruction set, so we will install it + ynh_print_warn --message="Installing Mongo 4.4 as $mongo_version is not compatible with your cpu (see https://docs.mongodb.com/manual/administration/production-notes/#x86_64)." + mongo_version="4.4" + fi - ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian $mongo_debian_release/mongodb-org/$mongo_version main" --package="mongodb-org mongodb-org-server mongodb-org-tools mongodb-mongosh" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc" - mongodb_servicename=mongod + ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian $mongo_debian_release/mongodb-org/$mongo_version main" --package="mongodb-org" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc" + mongodb_servicename=mongod # Make sure MongoDB is started and enabled systemctl enable $mongodb_servicename --quiet From 65f34964c29bc278558ba3e28846e09737e7fa25 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 7 Apr 2024 09:45:31 +0000 Subject: [PATCH 20/25] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7eb2559..5aeebd6 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Shipped version:** 0.3.1~ynh2 +**Shipped version:** 0.3.1~ynh3 **Demo:** diff --git a/README_eu.md b/README_eu.md index 430ea44..ec19cbe 100644 --- a/README_eu.md +++ b/README_eu.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Paketatutako bertsioa:** 0.3.1~ynh2 +**Paketatutako bertsioa:** 0.3.1~ynh3 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 6d9e3c9..f032fd2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Version incluse :** 0.3.1~ynh2 +**Version incluse :** 0.3.1~ynh3 **Démo :** diff --git a/README_gl.md b/README_gl.md index 75d5626..c2c5537 100644 --- a/README_gl.md +++ b/README_gl.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Versión proporcionada:** 0.3.1~ynh2 +**Versión proporcionada:** 0.3.1~ynh3 **Demo:** From 4d781d243aaa6a94114f7a3061c0c2fbf4537daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Thu, 11 Apr 2024 11:58:23 +0200 Subject: [PATCH 21/25] Support for IDE API --- conf/repository-next.json | 1 + conf/repository-stable.json | 1 + manifest.toml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/repository-next.json b/conf/repository-next.json index f63627d..03f1744 100644 --- a/conf/repository-next.json +++ b/conf/repository-next.json @@ -2,6 +2,7 @@ "$schema": "https://dont-code.net/schemas/v1/repository-schema.json", "name": "Next Repository __TENANT__", "description": "Repository provided by Dont-code offering next versions of all plugins", + "ideWebSocketUrl": "ws://__DOMAIN____PATH__/ide", "webSocketUrl": "ws://__DOMAIN____PATH__/preview", "storeApiUrl": "https://__DOMAIN____PATH__/data", "projectApiUrl": "https://__DOMAIN____PATH__/project", diff --git a/conf/repository-stable.json b/conf/repository-stable.json index a2d0c2a..587d604 100644 --- a/conf/repository-stable.json +++ b/conf/repository-stable.json @@ -2,6 +2,7 @@ "$schema": "https://dont-code.net/schemas/v1/repository-schema.json", "name": "Stable Repository __TENANT__", "description": "Repository provided by Dont-code using stable versions of plugins", + "ideWebSocketUrl": "ws://__DOMAIN____PATH__/ide", "webSocketUrl": "ws://__DOMAIN____PATH__/preview", "storeApiUrl": "https://__DOMAIN____PATH__/data", "projectApiUrl": "https://__DOMAIN____PATH__/project", diff --git a/manifest.toml b/manifest.toml index 504c6ea..5cf9942 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Dont-code Services" description.en = "Install services and databases needed to support Dont-code platform" description.fr = "Installe les services et base de données nécessaires pour utiliser la plateforme Dont-code" -version = "0.3.1~ynh3" +version = "0.3.1~ynh4" maintainers = ["Dont-code Team"] From aa1d2e780620edc230b30b591a429c299e9ce11e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 11 Apr 2024 09:58:29 +0000 Subject: [PATCH 22/25] Auto-update READMEs --- ALL_README.md | 1 + README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 77b7509..a01b345 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -4,3 +4,4 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 5aeebd6..b6a2471 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Shipped version:** 0.3.1~ynh3 +**Shipped version:** 0.3.1~ynh4 **Demo:** diff --git a/README_eu.md b/README_eu.md index ec19cbe..c123483 100644 --- a/README_eu.md +++ b/README_eu.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Paketatutako bertsioa:** 0.3.1~ynh3 +**Paketatutako bertsioa:** 0.3.1~ynh4 **Demoa:** diff --git a/README_fr.md b/README_fr.md index f032fd2..8561652 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Version incluse :** 0.3.1~ynh3 +**Version incluse :** 0.3.1~ynh4 **Démo :** diff --git a/README_gl.md b/README_gl.md index c2c5537..aca4f64 100644 --- a/README_gl.md +++ b/README_gl.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Versión proporcionada:** 0.3.1~ynh3 +**Versión proporcionada:** 0.3.1~ynh4 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..c5bea16 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,65 @@ + + +# YunoHost 的 Dont-code Services + +[![集成程度](https://dash.yunohost.org/integration/dont-code.svg)](https://dash.yunohost.org/appci/app/dont-code) ![工作状态](https://ci-apps.yunohost.org/ci/badges/dont-code.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/dont-code.maintain.svg) + +[![使用 YunoHost 安装 Dont-code Services](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dont-code) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Dont-code Services。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Dont-code is a low-code / no-code platform letting user create their own applications based on complete feature sets developed by IT. +You can find more information here: https://dont-code.net + +This Yunohost app installs the server part (services + mongo database) needed to run the dont-code applications. + +### Features + +- Thanks to the Powerful [Builders](https://dont-code.net/ide-ui) and [Previewers](https://dont-code.net/ide-ui), a user can directly design its application and immediately see the result +- One only needs to describe its application by filling sentences prepared by the platform. +- By default it provides support for images, currency, text, numbers, countries, links. +- Multiple plugins allow you to list, edit, make reports, call services, save to database, save in browser, and so on... +- Plugins can be developed by any IT team +- Projects and all user's data are backuped up as part of the Yunohost backup process +- As well any documents or images uploaded by users will be backed up + + +**分发版本：** 0.3.1~ynh4 + +**演示：** + +## 截图 + +![Dont-code Services 的截图](./doc/screenshots/previewer.gif) +![Dont-code Services 的截图](./doc/screenshots/ide.gif) + +## 文档与资源 + +- 官方应用网站： +- 官方用户文档： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug +或 +sudo yunohost app upgrade dont-code -u https://github.com/YunoHost-Apps/dont-code_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From 0f169a16f76df4dbb160b5033c23e657fb3a3dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Thu, 11 Apr 2024 12:07:49 +0200 Subject: [PATCH 23/25] nginx cors headers changed --- conf/nginx.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4f762ac..f3fb881 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,12 +3,11 @@ location __PATH__/ { # CORS support - add_header Access-Control-Allow-Origin *; + more_set_headers 'Access-Control-Allow-Origin: *'; # Handling preflight requests if ($request_method = OPTIONS) { - add_header Access-Control-Allow-Methods *; - add_header Access-Control-Allow-Headers *; + more_set_headers 'Access-Control-Allow-Methods: *' 'Access-Control-Allow-Headers: *'; } # Path to source From 6624a79c9120b4a426b5479cc9878ae49eb8ce92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Sat, 20 Apr 2024 12:25:13 +0200 Subject: [PATCH 24/25] Updated plugins urls --- conf/repository-next.json | 10 +++++----- conf/repository-stable.json | 10 +++++----- manifest.toml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/conf/repository-next.json b/conf/repository-next.json index 03f1744..783f41e 100644 --- a/conf/repository-next.json +++ b/conf/repository-next.json @@ -13,7 +13,7 @@ "display-name": "Basic plugin for editing entities", "version": "1.0.0", "info": { - "remote-entry":"https://dont-code.net/plugins/next/remoteEntry.mjs" + "remote-entry":"https://run.dont-code.net/plugins/next/remoteEntry.mjs" }, "config": {} }, @@ -22,7 +22,7 @@ "display-name": "Additional editors for entity properties", "version": "1.0.0", "info": { - "remote-entry":"https://dont-code.net/plugins/next/remoteEntry.mjs" + "remote-entry":"https://run.dont-code.net/plugins/next/remoteEntry.mjs" }, "config": {} }, @@ -31,7 +31,7 @@ "display-name": "Plugins to support datasources from Rest API", "version": "1.0.0", "info": { - "remote-entry":"https://dont-code.net/plugin-rest/next/remoteEntry.mjs" + "remote-entry":"https://run.dont-code.net/plugin-rest/next/remoteEntry.mjs" }, "config": {} }, @@ -40,7 +40,7 @@ "display-name": "Plugins to generate and display reports", "version": "1.0.0", "info": { - "remote-entry":"https://dont-code.net/plugin-report/next/remoteEntry.mjs" + "remote-entry":"https://run.dont-code.net/plugin-report/next/remoteEntry.mjs" }, "config": {} }, @@ -49,7 +49,7 @@ "display-name": "Plugins to get prices from shops", "version": "1.0.0", "info": { - "remote-entry":"https://dont-code.net/plugin-commerce/next/remoteEntry.mjs" + "remote-entry":"https://run.dont-code.net/plugin-commerce/next/remoteEntry.mjs" }, "config": {} } diff --git a/conf/repository-stable.json b/conf/repository-stable.json index 587d604..968baa4 100644 --- a/conf/repository-stable.json +++ b/conf/repository-stable.json @@ -13,7 +13,7 @@ "display-name": "Basic plugin for editing entities", "version": "1.0.0", "info": { - "remote-entry":"https://dont-code.net/plugins/latest/remoteEntry.mjs" + "remote-entry":"https://run.dont-code.net/plugins/latest/remoteEntry.mjs" }, "config": {} }, @@ -22,7 +22,7 @@ "display-name": "Additional editors for entity properties", "version": "1.0.0", "info": { - "remote-entry":"https://dont-code.net/plugins/latest/remoteEntry.mjs" + "remote-entry":"https://run.dont-code.net/plugins/latest/remoteEntry.mjs" }, "config": {} }, @@ -31,7 +31,7 @@ "display-name": "Plugins to support datasources from Rest API", "version": "1.0.0", "info": { - "remote-entry":"https://dont-code.net/plugin-rest/latest/remoteEntry.mjs" + "remote-entry":"https://run.dont-code.net/plugin-rest/latest/remoteEntry.mjs" }, "config": {} }, @@ -40,7 +40,7 @@ "display-name": "Plugins to generate and display reports", "version": "1.0.0", "info": { - "remote-entry":"https://dont-code.net/plugin-report/latest/remoteEntry.mjs" + "remote-entry":"https://run.dont-code.net/plugin-report/latest/remoteEntry.mjs" }, "config": {} }, @@ -49,7 +49,7 @@ "display-name": "Plugins to get prices from shops", "version": "1.0.0", "info": { - "remote-entry":"https://dont-code.net/plugin-commerce/latest/remoteEntry.mjs" + "remote-entry":"https://run.dont-code.net/plugin-commerce/latest/remoteEntry.mjs" }, "config": {} } diff --git a/manifest.toml b/manifest.toml index 5cf9942..4b57c35 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Dont-code Services" description.en = "Install services and databases needed to support Dont-code platform" description.fr = "Installe les services et base de données nécessaires pour utiliser la plateforme Dont-code" -version = "0.3.1~ynh4" +version = "0.3.1~ynh5" maintainers = ["Dont-code Team"] From 0f8dec73f6c5d7dff7f0d3deafe4a648ea960b9c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 20 Apr 2024 10:25:20 +0000 Subject: [PATCH 25/25] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b6a2471..d302211 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Shipped version:** 0.3.1~ynh4 +**Shipped version:** 0.3.1~ynh5 **Demo:** diff --git a/README_eu.md b/README_eu.md index c123483..5c5e4de 100644 --- a/README_eu.md +++ b/README_eu.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Paketatutako bertsioa:** 0.3.1~ynh4 +**Paketatutako bertsioa:** 0.3.1~ynh5 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 8561652..68ade82 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Version incluse :** 0.3.1~ynh4 +**Version incluse :** 0.3.1~ynh5 **Démo :** diff --git a/README_gl.md b/README_gl.md index aca4f64..8bf3ae4 100644 --- a/README_gl.md +++ b/README_gl.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Versión proporcionada:** 0.3.1~ynh4 +**Versión proporcionada:** 0.3.1~ynh5 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index c5bea16..d63738f 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**分发版本：** 0.3.1~ynh4 +**分发版本：** 0.3.1~ynh5 **演示：**