This commit is contained in:
Iwan Clement
2020-04-18 20:34:21 +02:00
parent 2ac2b6f15d
commit 53f6b54ab6

View File

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