From 255593918b96a6189c722bd7c38cdf77b2c6e5f7 Mon Sep 17 00:00:00 2001
From: Jan-Willem Gmelig Meyling <j.gmeligmeyling@student.tudelft.nl>
Date: Tue, 23 Feb 2016 01:59:56 +0100
Subject: [PATCH] Login using admin/admin credentials

---
 README.md                                    |  6 ++++++
 puppet/Puppetfile                            |  1 +
 puppet/files/config/devhub-server.properties | 12 ++++++------
 puppet/files/services/devhub-server.sh       |  2 ++
 puppet/manifests/default.pp                  |  7 +++++++
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index fc04380..d4779eb 100644
--- a/README.md
+++ b/README.md
@@ -7,3 +7,9 @@ git clone https://github.com/devhub-tud/vagrant-devhub.git
 vagrant plugin install vagrant-librarian-puppet
 vagrant up
 ```
+
+## Login
+The default user is `admin` / `admin`, installed as `cn=admin,dc=devhub,dc=local` in openldap.
+Through ldapadd additional users can be added.
+For more information, see: https://help.ubuntu.com/lts/serverguide/openldap-server.html . 
+
diff --git a/puppet/Puppetfile b/puppet/Puppetfile
index 960a141..c3ac536 100644
--- a/puppet/Puppetfile
+++ b/puppet/Puppetfile
@@ -6,3 +6,4 @@ mod 'maestrodev/maven'
 mod 'puppetlabs/docker_platform'
 mod 'nvpuppet/gitolite'
 mod 'puppetlabs/postgresql'
+mod 'datacentred/ldap'
diff --git a/puppet/files/config/devhub-server.properties b/puppet/files/config/devhub-server.properties
index c5fc340..09c69fb 100644
--- a/puppet/files/config/devhub-server.properties
+++ b/puppet/files/config/devhub-server.properties
@@ -29,12 +29,12 @@ smtp-server.origin = no-reply@devhub.ewi.tudelft.nl
 # smtp-server.pass = <password>
 
 # LDAP Settings
-ldap-server.host = ldaps.tudelft.nl
-ldap-server.port = 636
-ldap-server.usessl = true
-ldap.extension = @tudelft.net
-ldap.primarydomain = OU=MDS,DC=tudelft,DC=net
+ldap-server.host = localhost
+ldap-server.port = 389
+ldap-server.usessl = false
+ldap.extension = @devhub.local
+ldap.primarydomain = DC=devhub,DC=local
 
 # When false, we use the username plus the primary domain as DN for the bind request (LDAP).
 # When true, we use the username + extension as name for the bind request (Active Directory) .
-ldap.active-directory = true
+ldap.active-directory = false
diff --git a/puppet/files/services/devhub-server.sh b/puppet/files/services/devhub-server.sh
index 07078c5..6086223 100644
--- a/puppet/files/services/devhub-server.sh
+++ b/puppet/files/services/devhub-server.sh
@@ -54,9 +54,11 @@ EOF
 
 deploy() {
         su devhub << 'EOF'
+        cp -f /etc/devhub-server/config/config.properties /etc/devhub-server/config/config_backup.properties
         cp -f /etc/devhub-server/config/persistence.properties /etc/devhub-server/config/persistence_backup.properties
         cp -rf /etc/devhub-server/tmp/devhub/target/devhub-server-distribution/devhub-server/. /etc/devhub-server/.
         mv /etc/devhub-server/config/persistence_backup.properties /etc/devhub-server/config/persistence.properties
+        mv /etc/devhub-server/config/config_backup.properties /etc/devhub-server/config/config.properties
         rm -rf /etc/devhub-server/tmp
 EOF
 }
diff --git a/puppet/manifests/default.pp b/puppet/manifests/default.pp
index ae17724..27a05f7 100644
--- a/puppet/manifests/default.pp
+++ b/puppet/manifests/default.pp
@@ -62,6 +62,12 @@
     source => '/vagrant/files/services/devhub-server.sh'
   }
 
+  class { 'ldap::server':
+    suffix  => 'dc=devhub,dc=local',
+    rootdn  => 'cn=admin,dc=devhub,dc=local',
+    rootpw  => 'admin',
+  }
+
   exec { 'deploy devhub-server':
     command => '/usr/sbin/service devhub-server deploy',
     user => 'root',
@@ -72,6 +78,7 @@
       File['/etc/devhub-server/config/persistence.properties'],
       Class['postgresql::server'],
       Class['maven::maven'],
+      Class['ldap::server'],
       Class['jdk_oracle']
     ]
   }