diff --git a/.env.sample b/.env.sample index 3bab3b574e07b2b26313fb0b56030b5050f0b934..059c260120f1cb28e7961f6ea70ba544a1f3916c 100644 --- a/.env.sample +++ b/.env.sample @@ -1,2 +1,10 @@ +COMPOSE_FILE=docker-compose.yml:traefik.yml + HOST=gitlab.societe-informatique-de-france.fr TZ=Europe/Paris + +#EMAIL +GITLAB_MAIL=gitlab@societe-informatique-de-france.fr +SMTP_ADRESS=ssl0.ovh.net +SMTP_PASS=GITLAB_MAIL_SECRET_PASSWORD +SMTP_DOMAINE=societe-informatique-de-france.fr diff --git a/.gitignore b/.gitignore index 53331a9ebafc14280c2ac4580ca019edb6abdcc7..46a29bde352cbf0e89f11ffa048741faf9bd313e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/docker-compose.yml .env runner/.env diff --git a/docker-compose.yml.sample b/docker-compose.yml similarity index 82% rename from docker-compose.yml.sample rename to docker-compose.yml index 56d8a6b7234347341ed95bfc7190fae56a41548f..39c3d17e53b9a3fb75e96041fad43a2ae04834c5 100644 --- a/docker-compose.yml.sample +++ b/docker-compose.yml @@ -4,15 +4,14 @@ services: gitlab: image: 'gitlab/gitlab-ce:16.8.1-ce.0' restart: always - hostname: 'gitlab.FQDN' + hostname: '${HOST}' networks: - - ldap - traefik environment: TZ: GITLAB_OMNIBUS_CONFIG: | gitlab_rails['gitlab_shell_ssh_port'] = 2222 - external_url = 'https://gitlab.FQDN' + external_url = 'https://${HOST}' nginx['listen_port'] = 80 nginx['listen_https'] = false nginx['proxy_set_headers'] = { @@ -21,7 +20,7 @@ services: } nginx['redirect_http_to_https'] = true nginx['redirect_http_to_https_port'] = 80 - gitlab_rails['allowed_hosts'] = ['gitlab.FQDN', 'localhost', '127.0.0.1', 'gitlab'] + gitlab_rails['allowed_hosts'] = ['${HOST}', 'localhost', '127.0.0.1', 'gitlab'] # Each address is added to the the NGINX config as 'set_real_ip_from <address>;' # TODO replace the 172.19.0.6 ip by traefik's one nginx['real_ip_trusted_addresses'] = [ '172.19.0.2' ] @@ -41,50 +40,50 @@ services: } # Mail gitlab_rails['smtp_enable'] = true - gitlab_rails['smtp_address'] = "changeme" + gitlab_rails['smtp_address'] = "${SMTP_ADRESS}" gitlab_rails['smtp_port'] = 465 - gitlab_rails['smtp_user_name'] = "changeme@FQDN" - gitlab_rails['smtp_password'] = "changeme" - gitlab_rails['smtp_domain'] = "changeme" + gitlab_rails['smtp_user_name'] = "${GITLAB_MAIL}" + gitlab_rails['smtp_password'] = "${SMTP_PASS}" + gitlab_rails['smtp_domain'] = "${SMTP_DOMAINE}" gitlab_rails['smtp_authentication'] = "login" gitlab_rails['smtp_enable_starttls_auto'] = false gitlab_rails['smtp_tls'] = true gitlab_rails['smtp_openssl_verify_mode'] = 'peer' # If your SMTP server does not like the default 'From: gitlab@localhost' you # # can change the 'From' with this setting. - gitlab_rails['gitlab_email_from'] = 'changeme@FQDN' + gitlab_rails['gitlab_email_from'] = '${GITLAB_MAIL}' # gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com' gitlab_rails['incoming_email_enabled'] = true # The email address including the `%{key}` placeholder that will be replaced to reference the item being replied to. # The placeholder can be omitted but if present, it must appear in the "user" part of the address (before the `@`). - gitlab_rails['incoming_email_address'] = "changeme+%{key}@FQDN" - + gitlab_rails['incoming_email_address'] = "${GITLAB_MAIL}" + # Email account username # With third party providers, this is usually the full email address. # With self-hosted email servers, this is usually the user part of the email address. - gitlab_rails['incoming_email_email'] = "changeme@FDQN" + gitlab_rails['incoming_email_email'] = "${GITLAB_MAIL}" # Email account password - gitlab_rails['incoming_email_password'] = "changeme" - + gitlab_rails['incoming_email_password'] = "${SMTP_PASS}" + # IMAP server host - gitlab_rails['incoming_email_host'] = "changeme" + gitlab_rails['incoming_email_host'] = "${SMTP_ADRESS}" # IMAP server port gitlab_rails['incoming_email_port'] = 993 # Whether the IMAP server uses SSL gitlab_rails['incoming_email_ssl'] = true # Whether the IMAP server uses StartTLS gitlab_rails['incoming_email_start_tls'] = false - + # The mailbox where incoming mail will end up. Usually "inbox". gitlab_rails['incoming_email_mailbox_name'] = "inbox" # The IDLE command timeout. gitlab_rails['incoming_email_idle_timeout'] = 60 - + # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery gitlab_rails['incoming_email_expunge_deleted'] = true - + # Add any other gitlab.rb configuration here, each on its own line ports: - '2222:22'