YunoHost-Apps/phpldapadmin_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/phpldapadmin_ynh.git synced 2024-09-03 19:56:45 +02:00
Code Issues Activity Actions

Upgrade (#18)

Browse source 
* Upgrade

* Auto-update README

* Fix

Co-authored-by: yunohost-bot <yunohost@yunohost.org>
This commit is contained in:
Éric Gaspar 2022-10-20 19:13:59 +02:00 • committed by GitHub
parent 6f336822ed
commit 517eda5b05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 61 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
README.md
View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# phpLDAPadmin for YunoHost # 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) [![Integration level](https://dash.yunohost.org/integration/phpldapadmin.svg)](https://dash.yunohost.org/appci/app/phpldapadmin) ![Working status](https://ci-apps.yunohost.org/ci/badges/phpldapadmin.status.svg) ![Maintenance status](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) [![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)* *[Lire ce readme en français.](./README_fr.md)*
@ -17,31 +17,32 @@ 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. phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers.
**Shipped version:** 1.2.6.3~ynh1 **Shipped version:** 1.2.6.4~ynh1
**Demo:** https://olddemo.phpldapadmin.org/ **Demo:** https://olddemo.phpldapadmin.org/
## Screenshots ## Screenshots
![](./doc/screenshots/screenshot.png) ![Screenshot of phpLDAPadmin](./doc/screenshots/screenshot.png)
## Documentation and resources ## Documentation and resources
* Official app website: http://www.phpldapadmin.org * Official app website: <http://www.phpldapadmin.org>
* Official admin documentation: http://www.phpldapadmin.org * Official admin documentation: <http://www.phpldapadmin.org>
* Upstream app code repository: https://github.com/leenooks/phpLDAPadmin * Upstream app code repository: <https://github.com/leenooks/phpLDAPadmin>
* YunoHost documentation for this app: https://yunohost.org/app_phpldapadmin * YunoHost documentation for this app: <https://yunohost.org/app_phpldapadmin>
* Report a bug: https://github.com/YunoHost-Apps/phpldapadmin_ynh/issues * Report a bug: <https://github.com/YunoHost-Apps/phpldapadmin_ynh/issues>
## Developer info ## 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
sudo yunohost app install https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug
or or
sudo yunohost app upgrade phpldapadmin -u https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug 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 **More info regarding app packaging:** <https://yunohost.org/packaging_apps>

27
README_fr.md
View file

@ -1,10 +1,14 @@
<!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
It shall NOT be edited by hand.
-->
# phpLDAPadmin pour YunoHost # 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) [![Niveau d'intégration](https://dash.yunohost.org/integration/phpldapadmin.svg)](https://dash.yunohost.org/appci/app/phpldapadmin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/phpldapadmin.status.svg) ![Statut de maintenance](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) [![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)* *[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. > *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.* Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -13,31 +17,32 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers. phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers.
**Version incluse :** 1.2.6.3~ynh1 **Version incluse :** 1.2.6.4~ynh1
**Démo :** https://olddemo.phpldapadmin.org/ **Démo :** https://olddemo.phpldapadmin.org/
## Captures d'écran ## Captures d'écran
![](./doc/screenshots/screenshot.png) ![Capture d'écran de phpLDAPadmin](./doc/screenshots/screenshot.png)
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : http://www.phpldapadmin.org * Site officiel de l'app : <http://www.phpldapadmin.org>
* Documentation officielle de l'admin : 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 * Dépôt de code officiel de l'app : <https://github.com/leenooks/phpLDAPadmin>
* Documentation YunoHost pour cette app : https://yunohost.org/app_phpldapadmin * Documentation YunoHost pour cette app : <https://yunohost.org/app_phpldapadmin>
* Signaler un bug : https://github.com/YunoHost-Apps/phpldapadmin_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/phpldapadmin_ynh/issues>
## Informations pour les développeurs ## 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
sudo yunohost app install https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade phpldapadmin -u https://github.com/YunoHost-Apps/phpldapadmin_ynh/tree/testing --debug 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 **Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/leenooks/phpLDAPadmin/archive/1.2.6.3.tar.gz SOURCE_URL=https://github.com/leenooks/phpLDAPadmin/archive/1.2.6.4.tar.gz
SOURCE_SUM=718f805403279f8e54caa1046b5f43c989e3bce82c408d22d349b5393e4a2cea SOURCE_SUM=92e390c013714c75439737633ad4576bc642d87b0091fab6226cbbcb13a0ea48
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

2
conf/nginx.conf
View file

@ -2,7 +2,7 @@
location __PATH__/ { location __PATH__/ {
# Path to source # Path to source
alias __FINALPATH__/ ; alias __FINALPATH__/;
index index.php; index index.php;

6
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Manage OpenLDAP database over the web", "en": "Manage OpenLDAP database over the web",
"fr": "Application web de gestion de la base OpenLDAP" "fr": "Application web de gestion de la base OpenLDAP"
}, },
"version": "1.2.6.3~ynh1", "version": "1.2.6.4~ynh1",
"url": "http://www.phpldapadmin.org", "url": "http://www.phpldapadmin.org",
"upstream": { "upstream": {
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
@ -21,12 +21,12 @@
"email": "aymhce@gmail.com" "email": "aymhce@gmail.com"
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.3.0" "yunohost": ">= 11.0.9"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
"nginx", "nginx",
"php7.3-fpm" "php7.4-fpm"
], ],
"arguments": { "arguments": {
"install" : [ "install" : [

2
scripts/_common.sh
View file

@ -4,7 +4,7 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
YNH_PHP_VERSION="7.3" YNH_PHP_VERSION="7.4"
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS

16
scripts/install
View file

@ -64,14 +64,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Configuring NGINX web server..." --weight=2
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# PHP-FPM CONFIGURATION # PHP-FPM CONFIGURATION
#================================================= #=================================================
@ -81,6 +73,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=3
ynh_add_fpm_config ynh_add_fpm_config
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Configuring NGINX web server..." --weight=2
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# MODIFY A CONFIG FILE # MODIFY A CONFIG FILE
#================================================= #=================================================

17
scripts/restore
View file

@ -35,16 +35,11 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
ynh_script_progression --message="Validating restoration parameters..." --weight=2 ynh_script_progression --message="Validating restoration parameters..." --weight=2
test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " test ! -d $final_path \
|| ynh_die --message="There is already a directory: $final_path "
#================================================= #=================================================
# STANDARD RESTORATION STEPS # STANDARD RESTORATION STEPS
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# RECREATE THE DEDICATED USER # RECREATE THE DEDICATED USER
#================================================= #=================================================
@ -67,9 +62,17 @@ chown -R $app:www-data "$final_path"
#================================================= #=================================================
# RESTORE THE PHP-FPM CONFIGURATION # RESTORE THE PHP-FPM CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" 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"
#================================================= #=================================================
# SPECIFIC RESTORATION # SPECIFIC RESTORATION
#================================================= #=================================================

17
scripts/upgrade
View file

@ -90,14 +90,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# PHP-FPM CONFIGURATION # PHP-FPM CONFIGURATION
#================================================= #=================================================
@ -106,9 +98,18 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=5
# Create a dedicated PHP-FPM config # Create a dedicated PHP-FPM config
ynh_add_fpm_config ynh_add_fpm_config
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# MODIFY A CONFIG FILE # MODIFY A CONFIG FILE
#================================================= #=================================================
ynh_script_progression --message="Adding a configuration file..." --weight=1
ynh_add_config --template="../conf/config.php.example" --destination="$final_path/config/config.php" ynh_add_config --template="../conf/config.php.example" --destination="$final_path/config/config.php"
chmod 644 $final_path/config/config.php chmod 644 $final_path/config/config.php