Merge branch 'master' of https://git.cccv.de/infra/ansible/roles/gitlab

README.md

@@ -66,6 +66,22 @@ ldap:
   enabled: 'false'
   servers: {}
 
+# configure smtp server for outgoing mail
+smtp:
+  enabled: false
+  server: ~
+  port: 465
+  user: ~
+  password: ~
+  domain: ~
+  authentication: 'login' # Can be: 'login', 'plain'
+  starttls: true
+  tls: false
+  verify_ssl: 'peer' # Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'
+  #ca_path: '/etc/ssl/certs'
+  #ca_file: '/etc/ssl/certs/ca-certificates.crt'
+
+
 # array of groups to create
 groups: []
 ```

defaults/main.yml

@@ -28,6 +28,20 @@ gitlab:
     auto_link_ldap_user: 'true'
     providers: []
   upload_size_max: 128M
-  mail:
-    from: ~
-    reply_to: ~
+  mail: {}
+    #from: 'git@domain'
+    #reply_to: 'git@domain'
+  smtp:
+    enabled: false
+    server: ~
+    port: 465
+    user: ~
+    password: ~
+    domain: ~
+    authentication: 'login' # Can be: 'login', 'plain'
+    starttls: true
+    tls: false
+    verify_ssl: 'peer' # Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'
+    ca_path: ~ # eg '/etc/ssl/certs'
+    ca_file: ~ # eg '/etc/ssl/certs/ca-certificates.crt'
+>>>>>>> 6437b6d42cd6f19b8ff220e02319088c9819bd70

files/gitlab-ldap-sync.py

@@ -54,7 +54,11 @@ def connect_ldap(host, port, encryption, ca_file, bind_dn, bind_passwd):
 	old_search = conn.search
 	def search(*args, **kwargs):
 		kwargs.update({'attributes': [ldap3.ALL_ATTRIBUTES, ldap3.ALL_OPERATIONAL_ATTRIBUTES]})
-		return old_search(*args, **kwargs)
+		ret = old_search(*args, **kwargs)
+		result_code = conn.result['result']
+		if result_code != 0:
+			raise Exception(f'LDAP SEARCH failed with result code {result_code}')
+		return ret
 	conn.search = search
 	return conn
 

templates/gitlab.rb.j2

@@ -628,22 +628,30 @@ gitlab_rails['initial_root_password'] = "{{ gitlab.initial_root_password }}"
 ###! 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
+{% if gitlab.smtp.enabled %}
+gitlab_rails['smtp_enable'] = {{ gitlab.smtp.enabled|to_json }}
+gitlab_rails['smtp_address'] = "{{ gitlab.smtp.server }}"
+gitlab_rails['smtp_port'] = {{ gitlab.smtp.port }}
+gitlab_rails['smtp_user_name'] = "{{ gitlab.smtp.user }}"
+gitlab_rails['smtp_password'] = "{{ gitlab.smtp.password }}"
+{% if gitlab.smtp.domain %}
+gitlab_rails['smtp_domain'] = "{{ gitlab.smtp.domain }}"
+{% endif %}
+gitlab_rails['smtp_authentication'] = "{{ gitlab.smtp.authentication }}"
+gitlab_rails['smtp_enable_starttls_auto'] = {{ gitlab.smtp.starttls|to_json }}
+gitlab_rails['smtp_tls'] = {{ gitlab.smtp.tls|to_json }}
 
 ###! **Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'**
 ###! Docs: http://api.rubyonrails.org/classes/ActionMailer/Base.html
-# gitlab_rails['smtp_openssl_verify_mode'] = 'none'
+gitlab_rails['smtp_openssl_verify_mode'] = '{{ gitlab.smtp.verify_ssl }}'
 
-# gitlab_rails['smtp_ca_path'] = "/etc/ssl/certs"
-# gitlab_rails['smtp_ca_file'] = "/etc/ssl/certs/ca-certificates.crt"
+{% if gitlab.smtp.ca_path %}
+gitlab_rails['smtp_ca_path'] = "{{ gitlab.smtp.ca_path }}"
+{% endif %}
+{% if gitlab.smtp.ca_file %}
+gitlab_rails['smtp_ca_file'] = "{{ gitlab.smtp.ca_file }}"
+{% endif %}
+{% endif %}
 
 ################################################################################
 ## Container Registry settings