diff --git a/README.md b/README.md index 85566fa..713bd03 100644 --- a/README.md +++ b/README.md @@ -1,47 +1,41 @@ + + # phpLDAPadmin for YunoHost [![Integration level](https://dash.yunohost.org/integration/phpldapadmin.svg)](https://dash.yunohost.org/appci/app/phpldapadmin) ![](https://ci-apps.yunohost.org/ci/badges/phpldapadmin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/phpldapadmin.maintain.svg) [![Install phpLDAPadmin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpldapadmin) -> *This package allow you to install phpLDAPadmin quickly and simply on a YunoHost server. -If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* +*[Lire ce readme en français.](./README_fr.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.* ## Overview + phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers. -**Shipped version:** 1.2.6.2 +**Shipped version:** 1.2.6.2~ynh3 + +**Demo:** https://olddemo.phpldapadmin.org/ ## Screenshots -![](https://a.fsdn.com/con/app/proj/phpldapadmin/screenshots/303927.jpg/max/max/1) +![](./doc/screenshots/screenshot.png) -## Demo +## Documentation and resources -* [Official demo](http://phpldapadmin.sourceforge.net/wiki/index.php/Demo) +* Official app website: http://www.phpldapadmin.org +* Official admin documentation: http://www.phpldapadmin.org +* Upstream app code repository: https://github.com/leenooks/phpLDAPadmin +* YunoHost documentation for this app: https://yunohost.org/app_phpldapadmin +* Report a bug: https://github.com/YunoHost-Apps/phpldapadmin_ynh/issues -## Documentation +## Developer info - * Official documentation: http://www.phpldapadmin.org - -## YunoHost specific features - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/phpldapadmin%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/phpldapadmin/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/phpldapadmin%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/phpldapadmin/) - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/phpldapadmin_ynh/issues - * App website: http://www.phpldapadmin.org - * Upstream app repository: https://github.com/leenooks/phpLDAPadmin - * YunoHost website: https://yunohost.org/ - ---- - -## Developers info - -Please do 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. ``` @@ -49,3 +43,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree or sudo yunohost app upgrade phpldapadmin -u https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..ce9cadd --- /dev/null +++ b/README_fr.md @@ -0,0 +1,43 @@ +# phpLDAPadmin pour YunoHost + +[![Niveau d'intégration](https://dash.yunohost.org/integration/phpldapadmin.svg)](https://dash.yunohost.org/appci/app/phpldapadmin) ![](https://ci-apps.yunohost.org/ci/badges/phpldapadmin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/phpldapadmin.maintain.svg) +[![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 ce readme en français.](./README_fr.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.* + +## Vue d'ensemble + +phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers. + +**Version incluse :** 1.2.6.2~ynh3 + +**Démo :** https://olddemo.phpldapadmin.org/ + +## Captures d'écran + +![](./doc/screenshots/screenshot.png) + +## Documentations et ressources + +* Site officiel de l'app : http://www.phpldapadmin.org +* Documentation officielle de l'admin : http://www.phpldapadmin.org +* Dépôt de code officiel de l'app : https://github.com/leenooks/phpLDAPadmin +* Documentation YunoHost pour cette app : https://yunohost.org/app_phpldapadmin +* Signaler un bug : https://github.com/YunoHost-Apps/phpldapadmin_ynh/issues + +## Informations pour les développeurs + +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. +``` +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 :** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/conf/app.src b/conf/app.src index 388a9a8..9c69386 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,4 +3,3 @@ SOURCE_SUM=49b14019bf611267720b4e9de33f2502b44c526809f17225a4a76ee8296b8d64 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..924112b --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers. \ No newline at end of file diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..e69de29 diff --git a/doc/screenshots/screenshot.png b/doc/screenshots/screenshot.png new file mode 100644 index 0000000..6816cbe Binary files /dev/null and b/doc/screenshots/screenshot.png differ diff --git a/manifest.json b/manifest.json index 88283fe..41e1767 100644 --- a/manifest.json +++ b/manifest.json @@ -6,8 +6,15 @@ "en": "Manage OpenLDAP database over the web", "fr": "Application web de gestion de la base OpenLDAP" }, - "version": "1.2.6.2~ynh2", - "url": "http://phpldapadmin.sourceforge.net", + "version": "1.2.6.2~ynh3", + "url": "http://www.phpldapadmin.org", + "upstream": { + "license": "GPL-2.0-or-later", + "website": "http://www.phpldapadmin.org", + "demo": "https://olddemo.phpldapadmin.org/", + "admindoc": "http://www.phpldapadmin.org", + "code": "https://github.com/leenooks/phpLDAPadmin" + }, "license": "GPL-2.0-or-later", "maintainer": { "name": "aymhce", @@ -25,8 +32,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", @@ -36,8 +42,7 @@ }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" } ] } diff --git a/scripts/restore b/scripts/restore index 426f773..88535a6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -77,7 +77,7 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # GRANT ACCESS RIGHT TO ADMIN #================================================= -ynh_permission_update --permission "main" --add $admin --remove "all_users" +ynh_permission_update --permission="main" --add="$admin" --remove="all_users" #================================================= # GENERIC FINALIZATION