NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-20 02:06:42 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #555 from rfdrake/develop

Browse Source 
Fix for Docker ldap
This commit is contained in:
Jeremy Stretch 2016-09-16 09:59:43 -04:00 committed by GitHub
commit 2015d08407
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -5,7 +5,10 @@ WORKDIR /opt/netbox
ARG BRANCH=master ARG BRANCH=master
ARG URL=https://github.com/digitalocean/netbox.git ARG URL=https://github.com/digitalocean/netbox.git
RUN git clone --depth 1 $URL -b $BRANCH . && \ RUN git clone --depth 1 $URL -b $BRANCH . && \
pip install gunicorn==17.5 && pip install -r requirements.txt apt-get update -qq && apt-get install -y libldap2-dev libsasl2-dev libssl-dev && \
pip install gunicorn==17.5 && \
pip install django-auth-ldap && \
pip install -r requirements.txt
ADD docker/docker-entrypoint.sh /docker-entrypoint.sh ADD docker/docker-entrypoint.sh /docker-entrypoint.sh
ADD netbox/netbox/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py ADD netbox/netbox/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py

2
netbox/netbox/settings.py
View File

@ -71,7 +71,7 @@ if LDAP_CONFIGURED:
logger.setLevel(logging.DEBUG) logger.setLevel(logging.DEBUG)
except ImportError: except ImportError:
raise ImproperlyConfigured("LDAP authentication has been configured, but django-auth-ldap is not installed. " raise ImproperlyConfigured("LDAP authentication has been configured, but django-auth-ldap is not installed. "
"You can remove netbox/ldap.py to disable LDAP.") "You can remove netbox/ldap_config.py to disable LDAP.")
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))