From 53f6b54ab693feb14203321eecc14956487a0987 Mon Sep 17 00:00:00 2001
From: Iwan Clement <iwan@mg.lescorpsdereve.space>
Date: Sat, 18 Apr 2020 20:34:21 +0200
Subject: [PATCH] No LDAP

---
 gitlab/docker-compose.yml | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml
index fb858a8..57091aa 100644
--- a/gitlab/docker-compose.yml
+++ b/gitlab/docker-compose.yml
@@ -21,22 +21,21 @@ services:
                 gitlab_rails['smtp_domain'] = 'mg.devops-lyon.eu'
                 gitlab_rails['smtp_enable_starttls_auto'] = true
                 gitlab_rails['initial_root_password'] = 'M0ukreneIsGood!'
-                gitlab_rails['ldap_enabled'] = true
-                gitlab_rails['ldap_servers'] = {
-                    'main' => {
-                        'label' => 'Pidom AD',
-                        'host' =>  '192.168.111.252',
-                        'port' => 389,
-                        'uid' => 'sAMAccountName',
-                        'verify_certificates' => false,
-                        'bind_dn' => 'CN=GitLabSRV,CN=Users,DC=pidom,DC=chezclement,DC=maison',
-                        'password' => 'Password1',
-                        'active_directory' => true,
-                        'base' => 'OU=GitLab INT,DC=pidom,DC=chezclement,DC=maison',
-                        'group_base' => 'OU=Global Groups,OU=GitLab INT,DC=pidom,DC=chezclement,DC=maison',
-                        'admin_group' => 'Git_Admins'
-                    }
-                }
+                # gitlab_rails['ldap_enabled'] = true
+                # gitlab_rails['ldap_servers'] = {
+                #     'main' => {
+                #         'label' => 'Pidom AD',
+                #         'host' =>  '192.168.111.252',
+                #         'port' => 389,
+                #         'uid' => 'sAMAccountName',
+                #         'verify_certificates' => false,
+                #         'bind_dn' => 'CN=ldapuser,OU=Users,OU=Dardilly,DC=pidom,DC=chezclement,DC=maison',
+                #         'encryption' => 'plain'
+                #         'password' => 'E2ggSY3v33y5B6uwyjNXYGT2y_',
+                #         'active_directory' => true,
+                #         'base' => 'OU=Users,OU=Dardilly,DC=pidom,DC=chezclement,DC=maison'
+                #     }
+                # }
                 nginx['enable'] = true
                 nginx['redirect_http_to_https'] = false
                 nginx['proxy_set_headers'] = {"X-Forwarded-Proto" => "http", "CUSTOM_HEADER" => "VALUE"}
@@ -50,7 +49,7 @@ services:
         ports:
         - '4380:80'
         - '4322:22'
-        - '4443:443'
+        # - '4443:443'
         volumes:
         - 'gitlab_config:/etc/gitlab'
         - 'gitlab_logs:/var/log/gitlab'