From 878f42ab94cc24a31f0a28bfacc471fb54ef095b Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Jan 2024 09:12:25 +0100 Subject: [PATCH 1/2] Testing (#27) * 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 * cleaning * Update manifest.toml * Update manifest.toml * Auto-update README * Auto-update README * Fix * Update upgrade * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * fix --------- 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 +- manifest.toml | 11 +++++++---- scripts/install | 2 +- scripts/upgrade | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9d68b9a..acd3da8 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~ynh4 +**Shipped version:** 1.2.6.7~ynh1 **Demo:** https://olddemo.phpldapadmin.org/ diff --git a/README_fr.md b/README_fr.md index 9082594..0afdf61 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~ynh4 +**Version incluse :** 1.2.6.7~ynh1 **Démo :** https://olddemo.phpldapadmin.org/ diff --git a/manifest.toml b/manifest.toml index 02fe93a..d607e1c 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~ynh4" +version = "1.2.6.7~ynh1" maintainers = ["aymhce"] @@ -20,8 +20,11 @@ code = "https://github.com/leenooks/phpLDAPadmin" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = true + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -43,8 +46,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/leenooks/phpLDAPadmin/archive/1.2.6.6.tar.gz" - sha256 = "7a8c02a611e60aa6713d1cf863dfac9637e23c3f4d401ea5e47dbe2b22d4895a" + url = "https://github.com/leenooks/phpLDAPadmin/archive/1.2.6.7.tar.gz" + sha256 = "dde104aca695e18b0615859ae96177cdcb8a3294aee8d1d47a0b828af939679d" autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -56,4 +59,4 @@ ram.runtime = "50M" main.allowed = "admins" [resources.apt] - packages ='php8.1-fpm, php8.1-ldap, php8.1-xml' + packages ='php8.2-ldap, php8.2-xml' diff --git a/scripts/install b/scripts/install index 3c16a08..99a797d 100755 --- a/scripts/install +++ b/scripts/install @@ -36,7 +36,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/config.php.example" --destination="$install_dir/config/config.php" +ynh_add_config --template="config.php.example" --destination="$install_dir/config/config.php" chmod 644 "$install_dir/config/config.php" chown $app:$app "$install_dir/config/config.php" diff --git a/scripts/upgrade b/scripts/upgrade index b0361ac..1b3d3f3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,7 +48,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/config.php.example" --destination="$install_dir/config/config.php" +ynh_add_config --template="config.php.example" --destination="$install_dir/config/config.php" chmod 644 "$install_dir/config/config.php" chown $app:$app "$install_dir/config/config.php" From 650be1552be0faa3f98412cf324706308d1734cd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 29 Mar 2024 07:18:09 +0100 Subject: [PATCH 2/2] Auto-update README --- ALL_README.md | 6 ++++++ README.md | 26 +++++++++++++------------- README_fr.md | 32 ++++++++++++++++---------------- README_gl.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ README_it.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 133 insertions(+), 29 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_gl.md create mode 100644 README_it.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..3d6c579 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,6 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [Leggi il “README” in italiano](README_it.md) diff --git a/README.md b/README.md index acd3da8..8341676 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install phpLDAPadmin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpldapadmin) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README is other languages.](./ALL_README.md)* -> *This package allows you to install phpLDAPadmin quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install phpLDAPadmin quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview @@ -20,7 +20,7 @@ phpLDAPadmin is a web app for administering Lightweight Directory Access Protoco **Shipped version:** 1.2.6.7~ynh1 -**Demo:** https://olddemo.phpldapadmin.org/ +**Demo:** ## Screenshots @@ -28,19 +28,19 @@ phpLDAPadmin is a web app for administering Lightweight Directory Access Protoco ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug or sudo yunohost app upgrade phpldapadmin -u https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug diff --git a/README_fr.md b/README_fr.md index 0afdf61..ed0abce 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # phpLDAPadmin pour YunoHost @@ -9,18 +9,18 @@ It shall NOT be edited by hand. [![Installer phpLDAPadmin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpldapadmin) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer phpLDAPadmin rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer phpLDAPadmin rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers. -**Version incluse :** 1.2.6.7~ynh1 +**Version incluse :** 1.2.6.7~ynh1 -**Démo :** https://olddemo.phpldapadmin.org/ +**Démo :** ## Captures d’écran @@ -28,22 +28,22 @@ phpLDAPadmin is a web app for administering Lightweight Directory Access Protoco ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug ou sudo yunohost app upgrade phpldapadmin -u https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..ad36ea9 --- /dev/null +++ b/README_gl.md @@ -0,0 +1,49 @@ + + +# phpLDAPadmin para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/phpldapadmin.svg)](https://dash.yunohost.org/appci/app/phpldapadmin) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/phpldapadmin.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/phpldapadmin.maintain.svg) + +[![Instalar phpLDAPadmin con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpldapadmin) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar phpLDAPadmin de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers. + +**Versión proporcionada:** 1.2.6.7~ynh1 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de phpLDAPadmin](./doc/screenshots/screenshot.png) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug +ou +sudo yunohost app upgrade phpldapadmin -u https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_it.md b/README_it.md new file mode 100644 index 0000000..c609bf0 --- /dev/null +++ b/README_it.md @@ -0,0 +1,49 @@ + + +# phpLDAPadmin per YunoHost + +[![Livello di integrazione](https://dash.yunohost.org/integration/phpldapadmin.svg)](https://dash.yunohost.org/appci/app/phpldapadmin) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/phpldapadmin.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/phpldapadmin.maintain.svg) + +[![Installa phpLDAPadmin con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpldapadmin) + +*[Leggi questo README in altre lingue.](./ALL_README.md)* + +> *Questo pacchetto ti permette di installare phpLDAPadmin su un server YunoHost in modo semplice e veloce.* +> *Se non hai YunoHost, consulta [la guida](https://yunohost.org/install) per imparare a installarlo.* + +## Panoramica + +phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers. + +**Versione pubblicata:** 1.2.6.7~ynh1 + +**Prova:** + +## Screenshot + +![Screenshot di phpLDAPadmin](./doc/screenshots/screenshot.png) + +## Documentazione e risorse + +- Sito web ufficiale dell’app: +- Documentazione ufficiale per gli amministratori: +- Repository upstream del codice dell’app: +- Store di YunoHost: +- Segnala un problema: + +## Informazioni per sviluppatori + +Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing). + +Per provare la branch di `testing`, si prega di procedere in questo modo: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug +o +sudo yunohost app upgrade phpldapadmin -u https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug +``` + +**Maggiori informazioni riguardo il pacchetto di quest’app:**