Merge pull request #21 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lea el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)

README.md

@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 Collaborative maps and routing with a straightforward interface
 
-**Shipped version:** 3.4.0~ynh3
+**Shipped version:** 4.1.1~ynh1
 
 **Demo:** <https://facilmap.org/>
 

README_es.md

@@ -0,0 +1,50 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Facilmap para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/facilmap.svg)](https://dash.yunohost.org/appci/app/facilmap) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/facilmap.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/facilmap.maintain.svg)
+
+[![Instalar Facilmap con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=facilmap)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarFacilmap rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+Collaborative maps and routing with a straightforward interface
+
+**Versión actual:** 4.1.1~ynh1
+
+**Demo:** <https://facilmap.org/>
+
+## Capturas
+
+![Captura de Facilmap](./doc/screenshots/screenshot.webp)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://facilmap.org/>
+- Documentación usuario oficial: <https://docs.facilmap.org/users/>
+- Documentación administrador oficial: <https://docs.facilmap.org/developers/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/FacilMap/facilmap>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/facilmap>
+- Reportar un error: <https://github.com/YunoHost-Apps/facilmap_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/facilmap_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/facilmap_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade facilmap -u https://github.com/YunoHost-Apps/facilmap_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -18,7 +18,7 @@ EZ editatu eskuz.
 
 Collaborative maps and routing with a straightforward interface
 
-**Paketatutako bertsioa:** 3.4.0~ynh3
+**Paketatutako bertsioa:** 4.1.1~ynh1
 
 **Demoa:** <https://facilmap.org/>
 

README_fr.md

@@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
 Cartes et itinéraires collaboratifs avec une interface simple.
 
 
-**Version incluse :** 3.4.0~ynh3
+**Version incluse :** 4.1.1~ynh1
 
 **Démo :** <https://facilmap.org/>
 

README_gl.md

@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 Collaborative maps and routing with a straightforward interface
 
-**Versión proporcionada:** 3.4.0~ynh3
+**Versión proporcionada:** 4.1.1~ynh1
 
 **Demo:** <https://facilmap.org/>
 

README_zh_Hans.md

@@ -3,7 +3,7 @@
 请勿手动编辑。
 -->
 
-# YunoHost 的 Facilmap
+# YunoHost 上的 Facilmap
 
 [![集成程度](https://dash.yunohost.org/integration/facilmap.svg)](https://dash.yunohost.org/appci/app/facilmap) ![工作状态](https://ci-apps.yunohost.org/ci/badges/facilmap.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/facilmap.maintain.svg)
 
@@ -18,7 +18,7 @@
 
 Collaborative maps and routing with a straightforward interface
 
-**分发版本：** 3.4.0~ynh3
+**分发版本：** 4.1.1~ynh1
 
 **演示：** <https://facilmap.org/>
 

conf/config.env

@@ -1,3 +1,6 @@
+# Copy this file to config.env when running FacilMap standalone.
+# Find all the available configuration options in the documentation: https://docs.facilmap.org/developers/server/config.html
+
 # HTTP requests made by the backend will send this User-Agent header. Please adapt to your URL and e-mail address.
 USER_AGENT=__USER_AGENT__
 
@@ -22,12 +25,13 @@ ORS_TOKEN=__ORS_TOKEN__
 # Get an API key on https://www.mapbox.com/signup/
 MAPBOX_TOKEN=__MAPBOX_TOKEN__
 
-# MapZen is used for getting elevation information
-# Get an API key on https://mapzen.com/developers/sign_up
-#MAPZEN_TOKEN=
-
 # Maxmind configuration. If specified, the maxmind GeoLite2 database will be downloaded
 # for Geo IP lookup (to show the initial map state) and kept in memory.
 # Sign up here: https://www.maxmind.com/en/geolite2/signup
 MAXMIND_USER_ID=__MAXMIND_USER_ID__
 MAXMIND_LICENSE_KEY=__MAXMIND_LICENSE_KEY__
+
+# Lima Labs provides nice double resolution layers.
+# If this is defined, they are used as the default layer instead of Mapnik.
+# Get an API key here: https://maps.lima-labs.com/
+#LIMA_LABS_TOKEN=

conf/systemd.service

@@ -7,10 +7,10 @@ Type=simple
 User=__APP__
 Group=__APP__
 Environment=NODE_ENV=production
-Environment=DOTENV_CONFIG_PATH=__INSTALL_DIR__/etc/facilmap.env
+Environment=DOTENV_CONFIG_PATH=__INSTALL_DIR__/config.env
 Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=__INSTALL_DIR__/bin/facilmap-server
+WorkingDirectory=__INSTALL_DIR__/server
-WorkingDirectory=__INSTALL_DIR__
+ExecStart=/usr/bin/yarn server
 StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=__APP__

manifest.toml

@@ -7,7 +7,7 @@ name = "Facilmap"
 description.en = "Collaborative maps and routing with a straightforward interface"
 description.fr = "Carte collaborative avec une interface simple et pratique"
 
-version = "3.4.0~ynh3"
+version = "4.1.1~ynh1"
 
 maintainers = ["Squeak"]
 
@@ -23,11 +23,14 @@ code = "https://github.com/FacilMap/facilmap"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = false
+
 sso = false
-disk = "50M"
+
-ram.build = "50M"
+disk = "1000M"
-ram.runtime = "50M"
+ram.build = "2000M"
+ram.runtime = "450M"
 
 [install]
     [install.domain]
@@ -81,6 +84,13 @@ ram.runtime = "50M"
 
 [resources]
 
+    [resources.sources]
+
+    [resources.sources.main]
+    url = "https://github.com/FacilMap/facilmap/archive/refs/tags/v4.1.1.tar.gz"
+    sha256 = "72cf9f7fbc6e9d5c73f7c1af02be63d2c5a99d13cf89c96af834db6004c89cf6"
+    autoupdate.strategy = "latest_github_tag"
+
     [resources.ports]
 
     [resources.system_user]
@@ -93,5 +103,9 @@ ram.runtime = "50M"
     [resources.apt]
     packages = "mariadb-server"
 
+    extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main"
+    extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg"
+    extras.yarn.packages = "yarn"
+
     [resources.database]
     type = "mysql"

scripts/_common.sh

@@ -6,8 +6,6 @@
 
 nodejs_version=20
 
-facilmap_version=3.4.0
-
 #=================================================
 # PERSONAL HELPERS
 #=================================================

scripts/backup

@@ -31,10 +31,6 @@ ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
-#=================================================
-# BACKUP VARIOUS FILES
-#=================================================
-
 ynh_backup --src_path="/var/log/$app/"
 
 #=================================================

scripts/install

@@ -16,6 +16,15 @@ ynh_script_progression --message="Installing NodeJS..." --weight=6
 
 ynh_install_nodejs --nodejs_version=$nodejs_version
 
+#=================================================
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
+ynh_script_progression --message="Setting up source files..." --weight=1
+
+ynh_setup_source --dest_dir="$install_dir"
+
+chown -R "$app:www-data" "$install_dir"
+
 #=================================================
 # CREATE A MYSQL DATABASE
 #=================================================
@@ -28,10 +37,12 @@ ynh_mysql_execute_as_root --database="$db_name" --sql="ALTER DATABASE $db_name C
 #=================================================
 # BUILD NODE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Building with NodeJS..." --weight=20
+ynh_script_progression --message="Building $app..." --weight=10
 
 pushd "$install_dir"
-    ynh_exec_as $app "$ynh_node_load_PATH" "$ynh_npm" install --prefix "$install_dir" -g facilmap-server@"$facilmap_version" 2>/dev/null
+    ynh_use_nodejs
+    ynh_exec_warn_less env $ynh_node_load_PATH yarn install
+    ynh_exec_warn_less env $ynh_node_load_PATH yarn build   
 popd
 
 chmod 750 "$install_dir"
@@ -43,11 +54,10 @@ chown -R "$app:www-data" "$install_dir"
 #=================================================
 ynh_script_progression --message="Adding configuration..." --weight=2
 
-mkdir -p "$install_dir/etc"
+ynh_add_config --template="config.env" --destination="$install_dir/config.env"
-ynh_add_config --template="../conf/config.env" --destination="$install_dir/etc/facilmap.env"
 
-chown -R "$app:www-data" "$install_dir/etc"
+chown -R "$app:www-data" "$install_dir/config.env"
-chmod 400 "$install_dir/etc/facilmap.env"
+chmod 400 "$install_dir/config.env"
 
 #=================================================
 # SYSTEM CONFIGURATION

scripts/restore

@@ -24,8 +24,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$install_dir"
-chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"
 
 #=================================================
@@ -33,7 +31,6 @@ chown -R "$app:www-data" "$install_dir"
 #=================================================
 ynh_script_progression --message="Restoring the MySQL database..." --weight=1
 
-# echo "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci"
 ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql
 
 #=================================================
@@ -62,13 +59,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=5
 
 ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --line_match="Server started"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX AND PHP-FPM
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=2
-
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================

scripts/upgrade

@@ -25,15 +25,26 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 
+#=================================================
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
+
+ynh_setup_source --dest_dir="$install_dir"
+
+chown -R "$app:www-data" "$install_dir"
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
 # BUILD NODE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Install $app..." --weight=20
+ynh_script_progression --message="Install $app..." --weight=10
 
-pushd $install_dir
+pushd "$install_dir"
-    ynh_exec_as "$app" "$ynh_node_load_PATH" "$ynh_npm" install --prefix "$install_dir" -g facilmap-server@"$facilmap_version" 2>/dev/null
+    ynh_use_nodejs
+    ynh_exec_warn_less env $ynh_node_load_PATH yarn install
+    ynh_exec_warn_less env $ynh_node_load_PATH yarn build   
 popd
 
 chmod 750 "$install_dir"
@@ -45,11 +56,10 @@ chown -R "$app:www-data" "$install_dir"
 #=================================================
 ynh_script_progression --message="Updating config files..." --weight=2
 
-mkdir -p "$install_dir/etc"
+ynh_add_config --template="config.env" --destination="$install_dir/config.env"
-ynh_add_config --template="../conf/config.env" --destination="$install_dir/etc/facilmap.env"
 
-chown -R "$app:www-data" "$install_dir/etc"
+chown -R "$app:www-data" "$install_dir/config.env"
-chmod 400 "$install_dir/etc/facilmap.env"
+chmod 400 "$install_dir/config.env"
 
 #=================================================
 # GENERIC FINALIZATION
@@ -77,6 +87,7 @@ yunohost service add "$app" --description="Collaborative maps and routing" --log
 
 # Use logrotate to manage app-specific logfile(s)
 ynh_use_logrotate --non-append
+
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================