Testing / 2.2.1 / drop support for subpath installs

README.md

@@ -8,17 +8,21 @@ It shall NOT be edited by hand.
   phpLDAPadmin, packaged for YunoHost
 </h1>
 
-Manage OpenLDAP database over the web
+Manage LDAP databases using a web interface
 
 [![🌐 Official app website](https://img.shields.io/badge/Official_app_website-darkgreen?style=for-the-badge)](http://www.phpldapadmin.org)
 [![App Demo](https://img.shields.io/badge/App_Demo-blue?style=for-the-badge)](https://olddemo.phpldapadmin.org/)
-[![Version: 2.2.1~ynh1](https://img.shields.io/badge/Version-2.2.1~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/phpldapadmin/)
+[![Version: 2.2.1~ynh1](https://img.shields.io/badge/Version-2.2.1~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/phpldapadmin/)
 
 <div align="center">
 <a href="https://apps.yunohost.org/app/phpldapadmin"><img height="100px" src="https://github.com/YunoHost/yunohost-artwork/raw/refs/heads/main/badges/neopossum-badges/badge_more_info_on_the_appstore.svg"/></a>
 <a href="https://github.com/YunoHost-Apps/phpldapadmin_ynh/issues"><img height="100px" src="https://github.com/YunoHost/yunohost-artwork/raw/refs/heads/main/badges/neopossum-badges/badge_report_an_issue.svg"/></a>
 </div>
 
+
+## Screenshots
+![Screenshot of phpLDAPadmin](./doc/screenshots/screenshot.png)
+
 ## 📦 Developer info
 
 [![Automatic tests level](https://apps.yunohost.org/badge/cilevel/phpldapadmin)](https://ci-apps.yunohost.org/ci/apps/phpldapadmin/)

manifest.toml

@@ -4,8 +4,8 @@ packaging_format = 2
 
 id = "phpldapadmin"
 name = "phpLDAPadmin"
-description.en = "Manage OpenLDAP database over the web"
-description.fr = "Application web de gestion de la base OpenLDAP"
+description.en = "Manage LDAP databases using a web interface"
+description.fr = "Gérez des base LDAP depuis une interface web"
 
 version = "2.2.1~ynh1"
 
@@ -19,13 +19,12 @@ admindoc = "http://www.phpldapadmin.org"
 code = "https://github.com/leenooks/phpLDAPadmin"
 
 [integration]
-yunohost = ">= 12.0.9"
+yunohost = ">= 12.1.17"
 helpers_version = "2.1"
 architectures = "all"
 multi_instance = true
 
 ldap = true
-
 sso = false
 
 disk = "50M"
@@ -53,4 +52,10 @@ ram.runtime = "50M"
     main.allowed = "admins"
 
     [resources.apt]
-    packages ='php8.4-ldap, php8.4-xml, php8.4-igbinary, php8.4-msgpack, php8.4-memcached, php8.4-sqlite3'
+    packages ="php8.4-ldap, php8.4-xml, php8.4-igbinary, php8.4-msgpack, php8.4-memcached, php8.4-sqlite3"
+
+    [resources.nodejs]
+    version = "22"
+
+    [resources.composer]
+    version = "2.8.12"

scripts/backup

@@ -4,8 +4,6 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
-source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
 ynh_print_info "Declaring files to be backed up..."

scripts/change_url

@@ -4,7 +4,6 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================

scripts/install

@@ -4,7 +4,6 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -13,13 +12,6 @@ source /usr/share/yunohost/helpers
 
 key=$(ynh_string_random --length=32)
 
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression "Installing dependencies..."
-
-ynh_nodejs_install
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -69,7 +61,6 @@ popd
 #=================================================
 ynh_script_progression "Installing app..."
 
-ynh_composer_install
 ynh_composer_exec install --optimize-autoloader --no-dev
 
 #=================================================

scripts/remove

@@ -4,7 +4,6 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -16,8 +15,6 @@ ynh_config_remove_nginx
 
 ynh_config_remove_phpfpm
 
-ynh_nodejs_remove
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -4,8 +4,6 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
-source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================

scripts/upgrade

@@ -4,16 +4,8 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression "Installing dependencies..."
-
-ynh_nodejs_install
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -46,7 +38,6 @@ popd
 #=================================================
 ynh_script_progression "Installing app..."
 
-ynh_composer_install
 ynh_composer_exec install --optimize-autoloader --no-dev
 
 #=================================================