From 9eec975800c1f5a210a3ec85bc402b72092a3da3 Mon Sep 17 00:00:00 2001 From: Robert Drake Date: Thu, 8 Sep 2016 19:47:48 -0400 Subject: [PATCH 1/2] change ldap.py to ldap_config.py --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index bf63b272b..e9c6ce232 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -71,7 +71,7 @@ if LDAP_CONFIGURED: logger.setLevel(logging.DEBUG) except ImportError: 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__))) From 9718895ff9cbe88b16abbe56049eaddf9979c75a Mon Sep 17 00:00:00 2001 From: Robert Drake Date: Thu, 8 Sep 2016 20:05:32 -0400 Subject: [PATCH 2/2] add django-auth-ldap to Dockerfile --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2cf8b9294..63562e2ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,10 @@ WORKDIR /opt/netbox ARG BRANCH=master ARG URL=https://github.com/digitalocean/netbox.git 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 netbox/netbox/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py