diff --git a/ldap/Dockerfile b/ldap/Dockerfile
index 23a5909e9d23f9297fefb17561daf9ba9c094ba1..e5fd470d3722510ad30a594c12b37bbdd19e51c9 100644
--- a/ldap/Dockerfile
+++ b/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
diff --git a/ldap/build.sh b/ldap/build.sh
index f09133d1ed9139f641800cdfaf1132ae940a92c9..cc759a63aceb13feb92de128b20b6ac34f3ed46b 100644
--- a/ldap/build.sh
+++ b/ldap/build.sh
@@ -1 +1 @@
-docker build -t warpauth .
+docker build -t ldap .
diff --git a/ldap/data/fusiondirectory.conf b/ldap/data/fusiondirectory.conf
new file mode 100644
index 0000000000000000000000000000000000000000..5df16a7bfb827f3329af8c46958e2ab3cd8926cd
--- /dev/null
+++ b/ldap/data/fusiondirectory.conf
@@ -0,0 +1,26 @@
+<?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>
diff --git a/ldap/data/start.sh b/ldap/data/start.sh
index cbf57928b1cc2961a284c9e4edf047ddd5249204..d2b5e348603055eac224483853da332e1def2db7 100644
--- a/ldap/data/start.sh
+++ b/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
diff --git a/ldap/run.sh b/ldap/run.sh
index b1b7fd9b62715972274572492e3a5bcd7e82b443..ddf79d5ad8fb575046c49b693560fa5ca9cb3f0d 100644
--- a/ldap/run.sh
+++ b/ldap/run.sh
@@ -1,10 +1,11 @@
#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
diff --git a/ldap/stop_ldap.sh b/ldap/stop_ldap.sh
new file mode 100644
index 0000000000000000000000000000000000000000..5107941c31d1c10474d592647b9c9c54125f9e39
--- /dev/null
+++ b/ldap/stop_ldap.sh
@@ -0,0 +1,3 @@
+docker kill ldap
+docker rm ldap
+
diff --git a/web/templates/base.html b/web/templates/base.html
index 373596165d31ccc3ac0405bfb83f83d1d0a490f2..fe1eeb84fcc57faea151daf6194ff1b6feebb0f0 100644
--- a/web/templates/base.html
+++ b/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'/> Warpzone
+ <img style="display: inline; text-align:left" height="25" width="25" src='/media/warpzone_small.png'/> Warpzone
</a>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
<span class="icon-bar"></span>
diff --git a/web/templates/media/warpzone_logo_large.png b/web/templates/media/warpzone_logo_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8ff367f56de6902c1851c522baf793830a13755
Binary files /dev/null and b/web/templates/media/warpzone_logo_large.png differ
diff --git a/web/templates/media/warpzone_medium.png b/web/templates/media/warpzone_medium.png
new file mode 100644
index 0000000000000000000000000000000000000000..2af5bc235ef8aa761b57d8998e83a12f30719fda
Binary files /dev/null and b/web/templates/media/warpzone_medium.png differ
diff --git a/web/templates/media/warpzone_logo.png b/web/templates/media/warpzone_small.png
similarity index 100%
rename from web/templates/media/warpzone_logo.png
rename to web/templates/media/warpzone_small.png
diff --git a/web/warpmain/templates/warpmain/about.html b/web/warpmain/templates/warpmain/about.html
index 52f6b2fe1af3dabb97993057af2641e535ffd3e9..5c5d2749d7b1e6f73deb986ac23372b9b56c8a8c 100644
--- a/web/warpmain/templates/warpmain/about.html
+++ b/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>
diff --git a/web/warpzone/settings.py b/web/warpzone/settings.py
index 562aabb2bd6363f6d13a294d6085f36470faba56..db91d2adbea81f97ba37d5fbe991ab27483a6621 100644
--- a/web/warpzone/settings.py
+++ b/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"
diff --git a/web_docker/Dockerfile b/web_docker/Dockerfile
index d7a616ffabe8ace78af225104d1c530057cda3b0..25f5b356f854dd461de12ae59d28fb20e6475721 100644
--- a/web_docker/Dockerfile
+++ b/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
diff --git a/web_docker/entrypoint.sh b/web_docker/entrypoint.sh
index bb41662d21311acc10f88f908b4d04574c210c02..068a7633a4197fa95cf4e6f7d85bdaf7fb31660b 100644
--- a/web_docker/entrypoint.sh
+++ b/web_docker/entrypoint.sh
@@ -1,3 +1,10 @@
service rsyslog restart
+cd /opt/warpauth;
+
+python manage.py makemigrations
+python manage.py migrate
+
+python manage.py runserver 0.0.0.0:8000
+
bash
diff --git a/web_docker/run.sh b/web_docker/run.sh
index d043c24f2146068a6fe43995d662cd769852ccec..7710f890e1c23b6bfdc9c418161e48a371f033c8 100644
--- a/web_docker/run.sh
+++ b/web_docker/run.sh
@@ -1,5 +1,6 @@
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