diff --git a/README.md b/README.md
index 8eb7d12..d1ff2ef 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Easy!Appointments for YunoHost
-[![Integration level](https://dash.yunohost.org/integration/easyappointments.svg)](https://dash.yunohost.org/appci/app/easyappointments) ![Working status](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/easyappointments.svg)](https://ci-apps.yunohost.org/ci/apps/easyappointments/) ![Working status](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
[![Install Easy!Appointments with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=easyappointments)
@@ -30,7 +30,7 @@ The application is designed to be flexible enough so that it can handle any ente
- Translated user interface.
-**Shipped version:** 1.4.3~ynh3
+**Shipped version:** 1.5.0~ynh1
**Demo:**
diff --git a/README_es.md b/README_es.md
index 6898017..71ea033 100644
--- a/README_es.md
+++ b/README_es.md
@@ -5,7 +5,7 @@ No se debe editar a mano.
# Easy!Appointments para Yunohost
-[![Nivel de integración](https://dash.yunohost.org/integration/easyappointments.svg)](https://dash.yunohost.org/appci/app/easyappointments) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/easyappointments.svg)](https://ci-apps.yunohost.org/ci/apps/easyappointments/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
[![Instalar Easy!Appointments con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=easyappointments)
@@ -30,7 +30,7 @@ The application is designed to be flexible enough so that it can handle any ente
- Translated user interface.
-**Versión actual:** 1.4.3~ynh3
+**Versión actual:** 1.5.0~ynh1
**Demo:**
diff --git a/README_eu.md b/README_eu.md
index bfae722..58174ec 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -5,7 +5,7 @@ EZ editatu eskuz.
# Easy!Appointments YunoHost-erako
-[![Integrazio maila](https://dash.yunohost.org/integration/easyappointments.svg)](https://dash.yunohost.org/appci/app/easyappointments) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/easyappointments.svg)](https://ci-apps.yunohost.org/ci/apps/easyappointments/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
[![Instalatu Easy!Appointments YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=easyappointments)
@@ -30,7 +30,7 @@ The application is designed to be flexible enough so that it can handle any ente
- Translated user interface.
-**Paketatutako bertsioa:** 1.4.3~ynh3
+**Paketatutako bertsioa:** 1.5.0~ynh1
**Demoa:**
diff --git a/README_fr.md b/README_fr.md
index 7b885e2..587eaa3 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
# Easy!Appointments pour YunoHost
-[![Niveau d’intégration](https://dash.yunohost.org/integration/easyappointments.svg)](https://dash.yunohost.org/appci/app/easyappointments) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/easyappointments.svg)](https://ci-apps.yunohost.org/ci/apps/easyappointments/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
[![Installer Easy!Appointments avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=easyappointments)
@@ -29,7 +29,7 @@ Easy!Appointments est une application Web hautement personnalisable qui permet a
- Interface utilisateur traduite.
-**Version incluse :** 1.4.3~ynh3
+**Version incluse :** 1.5.0~ynh1
**Démo :**
diff --git a/README_gl.md b/README_gl.md
index d68e6e6..d06b273 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -5,7 +5,7 @@ NON debe editarse manualmente.
# Easy!Appointments para YunoHost
-[![Nivel de integración](https://dash.yunohost.org/integration/easyappointments.svg)](https://dash.yunohost.org/appci/app/easyappointments) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/easyappointments.svg)](https://ci-apps.yunohost.org/ci/apps/easyappointments/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
[![Instalar Easy!Appointments con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=easyappointments)
@@ -30,7 +30,7 @@ The application is designed to be flexible enough so that it can handle any ente
- Translated user interface.
-**Versión proporcionada:** 1.4.3~ynh3
+**Versión proporcionada:** 1.5.0~ynh1
**Demo:**
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index 438f472..bdbcc0c 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -5,7 +5,7 @@
# YunoHost 上的 Easy!Appointments
-[![集成程度](https://dash.yunohost.org/integration/easyappointments.svg)](https://dash.yunohost.org/appci/app/easyappointments) ![工作状态](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/easyappointments.svg)](https://ci-apps.yunohost.org/ci/apps/easyappointments/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/easyappointments.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/easyappointments.maintain.svg)
[![使用 YunoHost 安装 Easy!Appointments](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=easyappointments)
@@ -30,7 +30,7 @@ The application is designed to be flexible enough so that it can handle any ente
- Translated user interface.
-**分发版本:** 1.4.3~ynh3
+**分发版本:** 1.5.0~ynh1
**演示:**
diff --git a/manifest.toml b/manifest.toml
index 51b2a57..eed5479 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Easy!Appointments"
description.en = "Open Source Appointment Scheduler"
description.fr = "Planificateur de rendez-vous Open Source"
-version = "1.4.3~ynh3"
+version = "1.5.0~ynh1"
maintainers = ["eric_G"]
@@ -17,7 +17,7 @@ admindoc = "https://easyappointments.org/docs.html#1.4.3/readme.md"
code = "https://github.com/alextselegidis/easyappointments"
[integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.20"
architectures = "all"
multi_instance = true
@@ -46,8 +46,8 @@ ram.runtime = "50M"
[resources]
[resources.sources.main]
- url = "https://github.com/alextselegidis/easyappointments/releases/download/1.4.3/easyappointments-1.4.3.zip"
- sha256 = "8b7f56269f2ce2ac21195bbce96f9f35f465da92eb4d48ca8027a9df7e5106eb"
+ url = "https://github.com/alextselegidis/easyappointments/releases/download/1.5.0/easyappointments-1.5.0.zip"
+ sha256 = "2875e77fd019167ea62b304a93a39a3c0a402e602b642aaaf0d1f5c749265be1"
in_subdir = false
autoupdate.strategy = "latest_github_tag"
@@ -59,7 +59,7 @@ ram.runtime = "50M"
main.url = "/"
[resources.apt]
- packages = "mariadb-server, php8.2-mbstring, php8.2-gd, php8.2-curl, php8.2-mysql"
+ packages = "mariadb-server, php8.3-mbstring, php8.3-gd, php8.3-curl, php8.3-mysql"
[resources.database]
type = "mysql"
diff --git a/scripts/backup b/scripts/backup
index 214b288..30f2c81 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -22,15 +22,11 @@ ynh_print_info --message="Declaring files to be backed up..."
ynh_backup --src_path="$install_dir"
#=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
#=================================================
ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-#=================================================
-# BACKUP THE PHP-FPM CONFIGURATION
-#=================================================
-
ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
#=================================================
diff --git a/scripts/change_url b/scripts/change_url
index e976fa8..d7fc5ac 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -26,7 +26,7 @@ ynh_change_url_nginx_config
ynh_script_progression --message="Updating a configuration file..." --weight=1
domain=$new_domain
-ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php"
+ynh_add_config --template="config.php" --destination="$install_dir/config.php"
chmod 400 "$install_dir/config.php"
chown $app:$app "$install_dir/config.php"
diff --git a/scripts/install b/scripts/install
index 5d35ee6..5cd9f76 100644
--- a/scripts/install
+++ b/scripts/install
@@ -14,7 +14,6 @@ source /usr/share/yunohost/helpers
#=================================================
ynh_script_progression --message="Setting up source files..." --weight=7
-# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir"
chmod -R o-rwx "$install_dir"
@@ -26,11 +25,9 @@ chmod -R 770 "$install_dir/storage"
#=================================================
ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
-# Create a dedicated NGINX config
ynh_add_nginx_config
-# Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
#=================================================
# SPECIFIC SETUP
@@ -39,7 +36,7 @@ ynh_add_fpm_config --usage=low --footprint=low
#=================================================
ynh_script_progression --message="Adding a configuration file..." --weight=1
-ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php"
+ynh_add_config --template="config.php" --destination="$install_dir/config.php"
chmod 400 "$install_dir/config.php"
chown $app "$install_dir/config.php"
diff --git a/scripts/remove b/scripts/remove
index e69e0af..f717a6a 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -16,10 +16,8 @@ source /usr/share/yunohost/helpers
#=================================================
ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
-# Remove the dedicated NGINX config
ynh_remove_nginx_config
-# Remove the dedicated PHP-FPM config
ynh_remove_fpm_config
#=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 5251726..f4287ba 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,23 +9,12 @@
source _common.sh
source /usr/share/yunohost/helpers
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-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="$install_dir" --keep="config.php storage/"
-fi
+ynh_setup_source --dest_dir="$install_dir" --keep="config.php storage/"
chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir"
@@ -36,11 +25,9 @@ chmod -R 770 "$install_dir/storage"
#=================================================
ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
-# Create a dedicated NGINX config
ynh_add_nginx_config
-# Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
#=================================================
# END OF SCRIPT