systems/infrastructure
1
Fork 0
Code Issues 1 Pull requests 17 Activity Actions

Correctly set smtp user for GitLab

Browse source 
The user and from are different in my case.
This commit is contained in:
Jake Howard 2021-09-19 22:34:40 +01:00
parent 178ca6b2c4
commit 83ed8879dc
Signed by: jake
GPG key ID: 57AFB45680EDD477
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ansible/roles/gitlab/files/gitlab.rb
View file

@ -32,7 +32,7 @@ gitlab_rails['smtp_password'] = "{{ gitlab_smtp_password }}"
gitlab_rails['smtp_enable_starttls_auto'] = true gitlab_rails['smtp_enable_starttls_auto'] = true
gitlab_rails['smtp_tls'] = true gitlab_rails['smtp_tls'] = true
gitlab_rails['smtp_openssl_verify_mode'] = 'peer' gitlab_rails['smtp_openssl_verify_mode'] = 'peer'
gitlab_rails['gitlab_email_from'] = "{{ gitlab_smtp_user }}" gitlab_rails['gitlab_email_from'] = "{{ gitlab_from_email }}"
gitlab_rails['artifacts_path'] = "/mnt/gitlab-bulk/artifacts" gitlab_rails['artifacts_path'] = "/mnt/gitlab-bulk/artifacts"
gitlab_rails['backup_path'] = "/mnt/gitlab-bulk/backups" gitlab_rails['backup_path'] = "/mnt/gitlab-bulk/backups"

7
ansible/roles/gitlab/vars/main.yml
View file

@ -8,6 +8,13 @@ gitlab_smtp_password: !vault |
3832323835653964620a393264353864393066303264343438336665626266643338666564386532 3832323835653964620a393264353864393066303264343438336665626266643338666564386532
62626366343236623337353566623764653633356435623961623835313462343632 62626366343236623337353566623764653633356435623961623835313462343632
gitlab_smtp_user: !vault | gitlab_smtp_user: !vault |
$ANSIBLE_VAULT;1.1;AES256
65363932326464623165396365326130383464336166343832643563356363363930373339386534
3530316232363430386666623736366632313439313934360a313862646530383833383737333332
31313931626464636231616465313635306363666165383437386136383463646532626566376133
6134663039653633360a353036336135366530336530313562626262653130626463393836643435
66313166656461363931383837323937363365656139323564383263653037333434
gitlab_from_email: !vault |
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
65643234353935653465613934373736643931396363303734336233393335346431373136356630 65643234353935653465613934373736643931396363303734336233393335346431373136356630
3234363436383761346135613039353562643438306532630a383937346662306538623533623430 3234363436383761346135613039353562643438306532630a383937346662306538623533623430