diff --git a/README.md b/README.md index 9f77e31..a42f162 100644 --- a/README.md +++ b/README.md @@ -8,17 +8,21 @@ It shall NOT be edited by hand. phpLDAPadmin, packaged for YunoHost -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/)
+ +## 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/) diff --git a/manifest.toml b/manifest.toml index cb4bab6..506ef25 100644 --- a/manifest.toml +++ b/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" diff --git a/scripts/_common.sh b/scripts/_common.sh deleted file mode 100644 index a434891..0000000 --- a/scripts/_common.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -#================================================= -# COMMON VARIABLES AND CUSTOM HELPERS -#================================================= - -composer_version="2.8.9" -nodejs_version="22" diff --git a/scripts/backup b/scripts/backup index c64569c..030a031 100755 --- a/scripts/backup +++ b/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..." diff --git a/scripts/change_url b/scripts/change_url index 4563e01..4f6f849 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -4,7 +4,6 @@ # IMPORT GENERIC HELPERS #================================================= -source _common.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/install b/scripts/install index 160176f..a2e7228 100755 --- a/scripts/install +++ b/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 #================================================= diff --git a/scripts/remove b/scripts/remove index 48b89d4..4c0b501 100755 --- a/scripts/remove +++ b/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 #================================================= diff --git a/scripts/restore b/scripts/restore index ec87850..78fc26d 100755 --- a/scripts/restore +++ b/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 #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5d47eeb..abe7811 100644 --- a/scripts/upgrade +++ b/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 #=================================================