Some changes

README.md

@@ -0,0 +1,9 @@
+# vagrant-devhub
+Vagrant and Puppet files to provision Devhub servers
+
+## Install
+```sh
+git clone https://github.com/devhub-tud/vagrant-devhub.git
+vagrant plugin install vagrant-librarian-puppet
+vagrant up
+```

Vagrantfile

@@ -13,18 +13,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 	config.vm.synced_folder "~/.ssh", "/keys"
 	config.vm.synced_folder "puppet/files", "/vagrant/files"
 
-#	config.vm.synced_folder "/etc/git-server/mirrors", "/home/git/mirrors",
-#		mount_options: ["dmode=777", "fmode=666"]
-#	config.vm.synced_folder "/etc/git-server/repositories", "/home/git/repositories",
-#		mount_options: ["dmode=777", "fmode=666"]
+	config.vm.network "forwarded_port", guest: 8080, host: 8080
+	config.vm.network "forwarded_port", guest: 8081, host: 8081
+	# config.vm.network "forwarded_port", guest: 8082, host: 8082
 
 	config.puppet_install.puppet_version = "3.8.1"
 	config.librarian_puppet.puppetfile_dir = "puppet"
 	config.librarian_puppet.placeholder_filename = ".MYPLACEHOLDER"
 	config.librarian_puppet.use_v1_api  = '1' # Check https://github.com/rodjek/librarian-puppet#how-to-use
 	config.librarian_puppet.destructive = false # Check https://github.com/rodjek/librarian-puppet#how-to-use
 
-
 	config.vm.provision :puppet do |puppet|
 		puppet.options = "--verbose --debug"
 		puppet.manifests_path = "puppet/manifests"

puppet/Puppetfile

@@ -6,6 +6,3 @@ mod 'maestrodev/maven'
 mod 'puppetlabs/docker_platform'
 mod 'nvpuppet/gitolite'
 mod 'puppetlabs/postgresql'
-
-mod 'alkivi/ldap',
-  :git => "git://github.com/alkivi-sas/puppet-ldap.git"

puppet/files/config/devhub-server.properties

@@ -29,12 +29,12 @@ smtp-server.origin = [email protected]
 # smtp-server.pass = <password>
 
 # LDAP Settings
-ldap-server.host = localhost
+ldap-server.host = ldaps.tudelft.nl
 ldap-server.port = 636
 ldap-server.usessl = true
-ldap.extension = @devhub.local
-ldap.primarydomain = DC=devhub,DC=local
+ldap.extension = @tudelft.net
+ldap.primarydomain = OU=MDS,DC=tudelft,DC=net
 
 # 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 = false
+ldap.active-directory = true

puppet/files/config/git-server.properties

@@ -1,5 +1,5 @@
-gitolite.base-url = ssh\://git@localhost\:22/
-gitolite.repo-url = ssh\://git@localhost\:22/gitolite-admin
+gitolite.base-url = ssh\://git@localhost\:2222/
+gitolite.repo-url = ssh\://git@localhost\:2222/gitolite-admin
 gitolite.repositories = /srv/git/repositories
 gitolite.mirrors = /etc/git-server/mirrors
 http.port = 8081

puppet/manifests/default.pp

@@ -1,38 +1,22 @@
+include jdk_oracle
+
+class { 'maven::maven':
+ version => '3.3.9'
+}
+
 # include devhub::build-server
 include devhub::git-server
 include devhub::devhub-server
 
 class devhub::devhub-server {
 
-  include jdk_oracle
   include postgresql::server
 
-  class { 'maven::maven':
-   version => '3.3.9'
-  }
-
   postgresql::server::db { 'devhub':
    user     => 'devhub',
    password => postgresql_password('devhub', 'mypassword'),
   }
 
-  class { 'ldap' :
-    uri          => 'ldap.devhub.local',
-    base         => 'dc=devhub,dc=local',
-    organization => 'Devhub',
-    commonname   => 'devhub',
-    domain_name  => 'devhub.local',
-    ssl          => true,
-  }
-
-  ldap::user { 'admin':
-   email        => '[email protected]',
-   uname        => 'admin',
-   firstName    => 'Administrator',
-   lastName     => '',
-   create_local => false
-  }
-
   user { 'devhub':
    ensure => 'present',
    managehome => true
@@ -78,7 +62,7 @@
     source => '/vagrant/files/services/devhub-server.sh'
   }
 
-  exec { 'deploy devhub-server' :
+  exec { 'deploy devhub-server':
     command => '/usr/sbin/service devhub-server deploy',
     user => 'root',
     require => [
@@ -88,25 +72,18 @@
       File['/etc/devhub-server/config/persistence.properties'],
       Class['postgresql::server'],
       Class['maven::maven'],
-      Class['jdk_oracle'],
-      Class['ldap']
+      Class['jdk_oracle']
     ]
   }
 
-  service { 'devhub-server' :
+  service { 'devhub-server':
     ensure => running,
     require => Exec['deploy devhub-server']
   }
 }
 
 class devhub::git-server {
 
-  include jdk_oracle
-
-  class { 'maven::maven':
-   version => '3.3.9'
-  }
-
   class { 'gitolite':
    admin_pub_key => file('/keys/id_rsa.pub'),
   }
@@ -167,7 +144,7 @@
     source => '/vagrant/files/services/git-server.sh'
   }
 
-  exec { 'deploy git-server' :
+  exec { 'deploy git-server':
     command => '/usr/sbin/service git-server deploy',
     user => 'root',
     require => [
@@ -186,31 +163,30 @@
     require => Exec['deploy git-server']
   }
 
+  exec { 'forward port':
+    command => '/sbin/iptables -t nat -A OUTPUT -o lo -p tcp --dport 2222 -j REDIRECT --to-port 22',
+    user => 'root'
+  }
+
 }
 
 class devhub::build-server {
 
-  include jdk_oracle
-
-  class { 'maven::maven':
-   version => '3.3.9'
-  }
-
   package { "git":
     ensure		=> present,
   }
 
   group { 'build' :
-   ensure => 'present',
-   gid => '1004'
+    ensure => 'present',
+    gid => '1004'
   }
 
   user { 'build':
-   ensure => 'present',
-   gid => '1004',
-   uid => '1003',
-   managehome => true,
-   require => Group['build']
+    ensure => 'present',
+    gid => '1004',
+    uid => '1003',
+    managehome => true,
+    require => Group['build']
   }
 
   class { 'docker':
@@ -257,7 +233,7 @@
     source => '/vagrant/files/services/build-server.sh'
   }
 
-  exec { 'deploy build-server' :
+  exec { 'deploy build-server':
     command => '/usr/sbin/service build-server deploy',
     user => 'root',
     require => [
@@ -272,7 +248,7 @@
     ]
   }
 
-  service { 'build-server' :
+  service { 'build-server':
     ensure => running,
     require => Exec['deploy build-server']
   }