Foo

ldap/Dockerfile

@@ -13,18 +13,24 @@ RUN apt-get update && apt-get install -y \
 	apt-utils \
 	ssh \
 	less \
-	python3 \
-	python3-pip \
 	ldap-utils \
 	rsyslog \
 	nano \
 	slapd
 	
-RUN pip3 install Django
-
 RUN cp -r /etc/ldap/ /tmp
 
+RUN echo "deb http://repos.fusiondirectory.org/debian-jessie jessie main" >> /etc/apt/sources.list
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E184859262B4981F
+
+
+RUN apt-get update && apt-get install -y \
+    fusiondirectory \
+    fusiondirectory-schema  \
+    fusiondirectory-plugin-ssh
+
 COPY ./data/start.sh /opt/start.sh
+#COPY ./data/fusiondirectory.conf /etc/fusiondirectory/fusiondirectory.conf
 #COPY ./ldap.conf /etc/ldap/slapd.conf
 
 EXPOSE 22 8000 389

ldap/build.sh

-docker build -t warpauth .
+docker build -t ldap .

ldap/data/fusiondirectory.conf

+<?xml version="1.0"?>
+<conf>
+  <!-- Main section **********************************************************
+       The main section defines global settings, which might be overridden by
+       each location definition inside.
+
+       For more information about the configuration parameters, take a look at
+       the FusionDirectory.conf(5) manual page.
+  -->
+  <main default="localhost"
+        logging="TRUE"
+        displayErrors="FALSE"
+        forceSSL="FALSE"
+        templateCompileDirectory="/var/spool/fusiondirectory/"
+        debugLevel="0"
+    >
+
+    <!-- Location definition -->
+    <location name="localhost"
+    >
+        <referral URI="ldap://localhost:389/dc=warpzone,dc=ms"
+                        adminDn="cn=admin,dc=warpzone,dc=ms"
+                        adminPassword="12345" />
+    </location>
+  </main>
+</conf>

ldap/data/start.sh

@@ -4,9 +4,19 @@ if [ ! -f /etc/ldap/ldap.conf ]; then
         rm -r /tmp/ldap/
 fi
 
+#apt-get update && apt-get install -y \
+#    fusiondirectory \
+#    fusiondirectory-schema  \
+#    fusiondirectory-plugin-ssh
+
 service rsyslog restart
 chown -R openldap:openldap /etc/ldap/slapd.d
 chown -R openldap:openldap /var/lib/ldap
 service slapd restart
+
+
+fusiondirectory-insert-schema
+fusiondirectory-insert-schema -i /etc/ldap/schema/fusiondirectory/openssh-lpk.schema
+service apache2 restart
 bash
 

ldap/run.sh

 #docker run -v /opt/warpauth/data/warpauth:/opt/warpauth -p 389:389 -it warpauth
+#-v /opt/warpauth/data/warpauth:/opt/warpauth 
 
 docker run \
-	-v /opt/warpauth/data/warpauth:/opt/warpauth \
+	--name ldap \
 	-v /opt/warpauth/data/ldap_db:/var/lib/ldap \
 	-v /opt/warpauth/data/ldap_conf:/etc/ldap \
 	-p 389:389 \
-	-p 8000:8000 \
+        -p 8123:80 \
 	-it \
-	warpauth
+	ldap

ldap/stop_ldap.sh

+docker kill ldap
+docker rm ldap
+

web/templates/base.html

@@ -35,7 +35,7 @@
                 <div class="container">
                     <div class="navbar-header">
                         <a class="navbar-brand" href="/">
-                            <img style="display: inline; text-align:left"  height="25" width="25" src='/media/warpzone_logo.png'/>&nbsp;&nbsp;Warpzone
+                            <img style="display: inline; text-align:left"  height="25" width="25" src='/media/warpzone_small.png'/>&nbsp;&nbsp;Warpzone
                         </a>
                         <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
                             <span class="icon-bar"></span>

web/warpmain/templates/warpmain/about.html

@@ -5,8 +5,8 @@
     <h2>{% trans "About" %}</h2>
 
     <p class="lead">Welcome to Warpzone Internal</p>
-    <p>
-        <img class="img-responsive" style="margin-left: 100px; display: inline; float:right"  src="/media/warpzone_logo_orig.png">
+    <p class="text-justify">
+        <img class="img-responsive" style="margin-left: 100px; display: inline; float:right"  src="/media/warpzone_medium.png">
         Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
     </p>
 

web/warpzone/settings.py

@@ -104,7 +104,7 @@ DATABASES = {
     'ldap': {
         'ENGINE': 'ldapdb.backends.ldap',
         # 'NAME': 'ldap://s1.dyhost.de/',
-        'NAME': 'ldap://localhost/',
+        'NAME': 'ldap://ldap/',
         'USER': 'cn=admin,dc=warpzone,dc=ms',
         'PASSWORD': '12345',
     }
@@ -140,7 +140,7 @@ AUTHENTICATION_BACKENDS = (
 #
 
 # AUTH_LDAP_SERVER_URI = "ldap://s1.dyhost.de"
-AUTH_LDAP_SERVER_URI = "ldap://localhost"
+AUTH_LDAP_SERVER_URI = "ldap://ldap"
 
 AUTH_LDAP_BIND_DN = "cn=admin,dc=warpzone,dc=ms"
 AUTH_LDAP_BIND_PASSWORD = "12345"

web_docker/Dockerfile

@@ -10,21 +10,22 @@ RUN apt-get update && apt-get install -y \
 	nano \
 	python \
 	python-pip \
-	python-django-auth-ldap \
-	python-bootstrapform \
 	python-ldap \
-	python-dev
+	python-dev \
 	build-essential \
 	libfreetype6-dev \
 	python-imaging \
 	libjpeg-dev
 
+RUN apt-get -y install libsasl2-dev python-dev libldap2-dev libssl-dev
+
 RUN pip install django \
 		django-ldapdb \
-		reportlab
-
-RUN cd /opt/warpauth/;python manage.py migrate
+		django-auth-ldap \
+		reportlab \
+		--upgrade
 
+RUN apt-get install -y python-bootstrapform
 COPY entrypoint.sh /opt/entrypoint.sh
 EXPOSE 22 8000
 

web_docker/entrypoint.sh

 service rsyslog restart
+cd /opt/warpauth;
+
+python manage.py makemigrations
+python manage.py migrate
+
+python manage.py runserver 0.0.0.0:8000
+
 bash
 

web_docker/run.sh

 docker run \
-	-v /home/chris/Documents/warpzone/web:/opt/warpauth \
-	-p 8124:80 \
-	-it \
+	-v /home/chris/Documents/warpzone/pycharm/web:/opt/warpauth \
+	--link ldap:ldap \
+	-p 8000:8000 \
+	-itd \
 	warpauth_web