From da9f0aebf318562433fbdbad5b66df7407e680c8 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 17:53:14 +0200 Subject: [PATCH] Testing (#23) * Add badges * Upgrade to v.1.2.6.2 * Remove --phpversion * Small fixes * set permissions * Fix linter warnings * Set SVG badge * Fix linter * patch (#11) * Add templates (#13) * Add templates * Update manifest.json * Auto-update README * Update check_process * 1.2.6.3 (#16) * 1.2.6.3 * Upgrade (#18) * Upgrade * Auto-update README * Fix Co-authored-by: yunohost-bot * Version 2 (#21) * v2 * Auto-update README * v2 * fix * Auto-update README * Create change_url * Update manifest.toml --------- Co-authored-by: yunohost-bot * Auto-update README * Update config.php.example Close #20 * fix linter * Update manifest.toml * Auto-update README --------- Co-authored-by: Yunohost-Bot <> Co-authored-by: yunohost-bot Co-authored-by: Tagada <36127788+Tagadda@users.noreply.github.com> --- README.md | 2 +- README_fr.md | 2 +- conf/config.php.example | 2 +- manifest.toml | 10 +++++++--- scripts/install | 5 ----- scripts/remove | 5 ----- scripts/restore | 5 ----- scripts/upgrade | 5 ----- 8 files changed, 10 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 3fe59e4..cbe8a4f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers. -**Shipped version:** 1.2.6.6~ynh1 +**Shipped version:** 1.2.6.6~ynh2 **Demo:** https://olddemo.phpldapadmin.org/ diff --git a/README_fr.md b/README_fr.md index 38c0160..8d15186 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers. -**Version incluse :** 1.2.6.6~ynh1 +**Version incluse :** 1.2.6.6~ynh2 **Démo :** https://olddemo.phpldapadmin.org/ diff --git a/conf/config.php.example b/conf/config.php.example index a3432a1..bd6f34c 100644 --- a/conf/config.php.example +++ b/conf/config.php.example @@ -284,7 +284,7 @@ $servers->newServer('ldap_pla'); /* A convenient name that will appear in the tree viewer and throughout phpLDAPadmin to identify this LDAP server to users. */ $servers->setValue('server','name','YunoHost OpenLDAP Server'); -$servers->setValue('login','bind_id','cn=admin,dc=yunohost,dc=org'); +$servers->setValue('login','bind_id','uid=username,ou=users,dc=yunohost,dc=org'); /* Examples: 'ldap.example.com', diff --git a/manifest.toml b/manifest.toml index f20c9ef..f9999c5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "phpLDAPadmin" description.en = "Manage OpenLDAP database over the web" description.fr = "Application web de gestion de la base OpenLDAP" -version = "1.2.6.6~ynh1" +version = "1.2.6.6~ynh2" maintainers = ["aymhce"] @@ -17,7 +17,7 @@ admindoc = "http://www.phpldapadmin.org" code = "https://github.com/leenooks/phpLDAPadmin" [integration] -yunohost = ">= 11.1.16" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = true @@ -34,6 +34,10 @@ ram.runtime = "50M" type = "path" default = "/phpldapadmin" + [install.init_main_permission] + type = "group" + default = "visitors" + [install.admin] type = "user" @@ -51,4 +55,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages ='php7.4-fpm' \ No newline at end of file + packages ='php8.2-fpm' diff --git a/scripts/install b/scripts/install index a221fa8..96f6720 100755 --- a/scripts/install +++ b/scripts/install @@ -28,11 +28,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 # Create a dedicated php-fpm config ynh_add_fpm_config --usage=low --footprint=low -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 - # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index 787cb2c..4fb7e3c 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index fded87c..1be7eb8 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,11 +27,6 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index fa7f474..0b9fd73 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,11 +40,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=5 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 - # Create a dedicated NGINX config ynh_add_nginx_config