Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0d661de7c0 | |||
| 25b4861905 | |||
| a35ab05178 | |||
| 62092d1370 | |||
| e68cde0b73 | |||
| bdee69c323 |
+1
-1
@@ -18,7 +18,7 @@ LETS_ENCRYPT_ENV=production
|
||||
GITLAB_ROOT_EMAIL="gitlab_admin@example.com"
|
||||
SECRET_INITIAL_ROOT_PASSWORD_VERSION=v1
|
||||
SECRET_RUNNER_TOKEN_VERSION=v1
|
||||
SECRET_SMTP_PASSWORD=v1
|
||||
SECRET_SMTP_PASSWORD_VERSION=v1
|
||||
|
||||
GITLAB_CONF_VERSION=v1
|
||||
ENTRYPOINT_VERSION=v1
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
app:
|
||||
image: 'gitlab/gitlab-ce:18.10.4-ce.0'
|
||||
image: 'gitlab/gitlab-ce:18.11.7-ce.0'
|
||||
networks:
|
||||
- proxy
|
||||
- internal
|
||||
|
||||
+11
-11
@@ -82,15 +82,16 @@ external_url 'https://{{ env "DOMAIN" }}'
|
||||
###! Docs: https://docs.gitlab.com/omnibus/settings/smtp.html
|
||||
###! **Use smtp instead of sendmail/postfix.**
|
||||
|
||||
# gitlab_rails['smtp_enable'] = true
|
||||
# gitlab_rails['smtp_address'] = "smtp.server"
|
||||
# gitlab_rails['smtp_port'] = 465
|
||||
# gitlab_rails['smtp_user_name'] = "smtp user"
|
||||
# gitlab_rails['smtp_password'] = "smtp password"
|
||||
# gitlab_rails['smtp_domain'] = "example.com"
|
||||
# gitlab_rails['smtp_authentication'] = "login"
|
||||
# gitlab_rails['smtp_enable_starttls_auto'] = true
|
||||
# gitlab_rails['smtp_tls'] = false
|
||||
gitlab_rails['smtp_enable'] = {{ env "SMTP_ENABLE_FLAG" }}
|
||||
gitlab_rails['smtp_address'] = "{{ env "SMTP_HOST" }}"
|
||||
gitlab_rails['smtp_port'] = {{ env "SMTP_PORT" }}
|
||||
gitlab_rails['smtp_user_name'] = "{{ env "SMTP_USER" }}"
|
||||
gitlab_rails['smtp_password'] = "{{ secret "smtp_password" }}"
|
||||
gitlab_rails['smtp_domain'] = "{{ env "SMTP_DOMAIN" }}"
|
||||
gitlab_rails['smtp_authentication'] = "login"
|
||||
gitlab_rails['smtp_enable_starttls_auto'] = true
|
||||
gitlab_rails['smtp_tls'] = false
|
||||
|
||||
# gitlab_rails['smtp_pool'] = false
|
||||
|
||||
###! **Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'**
|
||||
@@ -2291,7 +2292,7 @@ registry_nginx['listen_https'] = false
|
||||
# grafana['metrics_basic_auth_password'] = 'please_set_a_unique_password' # default: nil
|
||||
# grafana['alerting_enabled'] = false
|
||||
|
||||
### SMTP Configuration
|
||||
### SMTP Configuration
|
||||
#
|
||||
# See: http://docs.grafana.org/administration/configuration/#smtp
|
||||
#
|
||||
@@ -2308,7 +2309,6 @@ registry_nginx['listen_https'] = false
|
||||
# 'ehlo_identity' => '{{ env "SMTP_EHLO" }}',
|
||||
# 'startTLS_policy' => {{ env "SMTP_STARTTLS_FLAG" }}
|
||||
# }
|
||||
|
||||
# Grafana usage reporting defaults to gitlab_rails['usage_ping_enabled']
|
||||
# grafana['reporting_enabled'] = true
|
||||
|
||||
|
||||
Reference in New Issue
Block a user