Merge branch 'gitlab_smtp'

.gitlab-ci.yml

@@ -102,9 +102,9 @@ variables:
   stage: prepare
   retry: 2  
   needs:
-    - prepare_ssh_scripts
-  dependencies:
-    - prepare_ssh_scripts
+    - job: prepare_ssh_scripts
+      artifacts: true
+  dependencies: null
   image: $SSH_DOCKERIMAGE
   artifacts:
     paths:

gitlab/gitlab.rb

@@ -649,15 +649,17 @@ gitlab_rails['db_port'] = 5432
 ###! 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'] = true
+gitlab_rails['smtp_address'] = "mail.privateemail.com"
+gitlab_rails['smtp_port'] = 587
+gitlab_rails['smtp_user_name'] = "no-reply@420joos.dev"
+gitlab_rails['smtp_password'] = "GOvcPSzmgo3kfCzs4dGvCRwM93cnw1aw"
+gitlab_rails['smtp_domain'] = "mail.privateemail.com"
+gitlab_rails['smtp_authentication'] = "login"
+gitlab_rails['smtp_enable_starttls_auto'] = true
+# gitlab_rails['smtp_tls'] = true
+gitlab_rails['gitlab_email_from'] = 'no-reply@420joos.dev'
+gitlab_rails['gitlab_email_reply_to'] = 'no-reply@420joos.dev'
 
 ###! **Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'**
 ###! Docs: http://api.rubyonrails.org/classes/ActionMailer/Base.html