Skip to content
Snippets Groups Projects
Commit 1e4ac80c authored by Pavel Břoušek's avatar Pavel Břoušek
Browse files

chore: merge branch 'ldap-req' into 'main'

fix(deps): move ldap3 to extras

See merge request perun-proxy-aai/python/perun-proxy-utils!35
parents 15a3cf76 1795b125
No related branches found
No related tags found
1 merge request!35fix(deps): move ldap3 to extras
Pipeline #296039 passed with warnings
...@@ -85,3 +85,20 @@ python3 check_user_logins.py ...@@ -85,3 +85,20 @@ python3 check_user_logins.py
-r "^(?P<datetime>.{20}).*audit-login.* (?P<userid>[0-9]+)@muni\.cz$" -r "^(?P<datetime>.{20}).*audit-login.* (?P<userid>[0-9]+)@muni\.cz$"
-d "%b %d %Y %H:%M:%S" -d "%b %d %Y %H:%M:%S"
``` ```
### check_ldap.py
- check whether LDAP is available
- to use this check, you must install the ldap extra:
```sh
pip install perun.proxy.utils[ldap]
```
and the [build prerequisites of the python-ldap library](https://www.python-ldap.org/en/latest/installing.html#build-prerequisites)
- for usage run:
```sh
python3 check_ldap.py --help
```
...@@ -14,11 +14,15 @@ setuptools.setup( ...@@ -14,11 +14,15 @@ setuptools.setup(
"docker~=6.0", "docker~=6.0",
"beautifulsoup4~=4.12", "beautifulsoup4~=4.12",
"requests~=2.31", "requests~=2.31",
"ldap3~=2.9.1",
"PyYAML>=5.4,<7.0", "PyYAML>=5.4,<7.0",
"check_syncrepl_extended~=2020.13", "check_syncrepl_extended~=2020.13",
"check_nginx_status~=1.0", "check_nginx_status~=1.0",
], ],
extras_require={
"ldap": [
"ldap3~=2.9.1",
]
},
entry_points={ entry_points={
"console_scripts": [ "console_scripts": [
"run_probes=perun.proxy.utils.run_probes:main", "run_probes=perun.proxy.utils.run_probes:main",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment