mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-12 22:25:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix ldap lib loading after apt install

Browse source
This commit is contained in:
Nick Sweeting 2024-10-09 04:03:02 -07:00
parent 1b7aca130b
commit 2f68a1d476
No known key found for this signature in database
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
archivebox/misc/checks.py
View file

@ -80,9 +80,9 @@ def check_not_root():
from archivebox.config.permissions import IS_ROOT, IN_DOCKER from archivebox.config.permissions import IS_ROOT, IN_DOCKER
attempted_command = ' '.join(sys.argv[1:]) if len(sys.argv) > 1 else '' attempted_command = ' '.join(sys.argv[1:]) if len(sys.argv) > 1 else ''
is_getting_help = '-h' in sys.argv or '--help' in sys.argv or 'help' in sys.argv[:2] is_getting_help = '-h' in sys.argv or '--help' in sys.argv or 'help' in sys.argv
is_getting_version = '--version' in sys.argv or 'version' in sys.argv[:2] is_getting_version = '--version' in sys.argv or 'version' in sys.argv
is_installing = 'setup' in sys.argv[:2] or 'install' in sys.argv[:2] is_installing = 'setup' in sys.argv or 'install' in sys.argv
if IS_ROOT and not (is_getting_help or is_getting_version or is_installing): if IS_ROOT and not (is_getting_help or is_getting_version or is_installing):
print('[red][!] ArchiveBox should never be run as root![/red]', file=sys.stderr) print('[red][!] ArchiveBox should never be run as root![/red]', file=sys.stderr)

2
archivebox/plugins_auth/ldap/apps.py
View file

@ -57,7 +57,7 @@ class LdapBinary(BaseBinary):
"packages": lambda: ['python-ldap>=3.4.3', 'django-auth-ldap>=4.1.0'], "packages": lambda: ['python-ldap>=3.4.3', 'django-auth-ldap>=4.1.0'],
}, },
apt.name: { apt.name: {
"abspath": lambda: get_LDAP_LIB_path(SYS_SITE_PACKAGES), "abspath": lambda: get_LDAP_LIB_path((*USER_SITE_PACKAGES, *SYS_SITE_PACKAGES)),
"version": lambda: get_LDAP_LIB_version(), "version": lambda: get_LDAP_LIB_version(),
"packages": lambda: ['libssl-dev', 'libldap2-dev', 'libsasl2-dev', 'python3-ldap', 'python3-msgpack', 'python3-mutagen'], "packages": lambda: ['libssl-dev', 'libldap2-dev', 'libsasl2-dev', 'python3-ldap', 'python3-msgpack', 'python3-mutagen'],
}, },