Skip to content

Commit

Permalink
Merge pull request HXSecurity#1860 from Bidaya0/feat/add-ldap-settings
Browse files Browse the repository at this point in the history
Feat/add ldap settings
  • Loading branch information
Bidaya0 authored Oct 8, 2023
2 parents f8176ab + 4a3f4ad commit 878e75d
Show file tree
Hide file tree
Showing 8 changed files with 122 additions and 66 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ ENV TZ=Asia/Shanghai
RUN apt-get update -y \
&& apt install -y gettext gcc make cmake libmariadb-dev curl libc6-dev libxrender1 libxtst6 libxi6 unzip cron \
fonts-wqy-microhei vim build-essential ninja-build cython3 pybind11-dev libre2-dev locales \
# htop sysstat net-tools iproute2 procps lsof \
libsasl2-dev python3-dev libldap2-dev libssl-dev \
# htop sysstat net-tools iproute2 procps lsof \
zip libjpeg62 \
&& sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen \
&& ALIMARCH=`arch` && curl -L https://charts.dongtai.io/apk/${ALIMARCH}/wkhtmltopdf -o /usr/bin/wkhtmltopdf \
Expand Down
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ pydot = "*"
more-itertools = "*"
pyotp = "~=2.9.0"
qrcode = "~=7.4"
django-auth-ldap = "==4.6.0"

[dev-packages]

Expand Down
Loading

0 comments on commit 878e75d

Please sign in to comment.