diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml index d020f09..dc8eb6f 100644 --- a/gitlab/docker-compose.yml +++ b/gitlab/docker-compose.yml @@ -4,7 +4,7 @@ services: image: 'gitlab/gitlab-ce:latest' container_name: gitlab_ce restart: always - hostname: 'gitlab.devops-lyon.eu' + hostname: 'gitlab' environment: GITLAB_OMNIBUS_CONFIG: | external_url 'https://gitlab.devops-lyon.eu' @@ -20,11 +20,37 @@ services: gitlab_rails['smtp_password'] = '2b074061f7fcc2562af5e8002a246abf-9a235412-23599447' 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=GitLab,DC=org', + 'password' => 'Password1', + 'active_directory' => true, + 'base' => 'OU=GitLab INT,DC=GitLab,DC=org', + 'group_base' => 'OU=Global Groups,OU=GitLab INT,DC=GitLab,DC=org', + 'admin_group' => 'Git_Admins' + } + } + nginx['enable'] = true + nginx['redirect_http_to_https'] = false + nginx['proxy_set_headers'] = {"X-Forwarded-Proto" => "http", "CUSTOM_HEADER" => "VALUE"} + # Each address is added to the the NGINX config as 'set_real_ip_from
;' + nginx['real_ip_trusted_addresses'] = [ '192.168.111.0/24' ] + # other real_ip config options + nginx['real_ip_header'] = 'X-Forwarded-For' + nginx['real_ip_recursive'] = 'on' # gitlab_rails['smtp_authentication'] 'login' # Add any other gitlab.rb configuration here, each on its own line ports: - '4380:80' - '4322:22' + - '4443:443' volumes: - 'gitlab_config:/etc/gitlab' - 'gitlab_logs:/var/log/gitlab'