Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos
Commits
117f23de
Commit
117f23de
authored
Nov 09, 2015
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X email sending via sidekiq draftly works
parent
8d8b8c5f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
software/gitlab/gitlab-parameters.cfg
software/gitlab/gitlab-parameters.cfg
+4
-2
software/gitlab/template/smtp_settings.rb.in
software/gitlab/template/smtp_settings.rb.in
+3
-0
No files found.
software/gitlab/gitlab-parameters.cfg
View file @
117f23de
...
@@ -33,13 +33,15 @@ configuration.email_reply_to = noreply@example.com
...
@@ -33,13 +33,15 @@ configuration.email_reply_to = noreply@example.com
# FIXME XXX smtp_enable not used yet
# FIXME XXX smtp_enable not used yet
configuration.smtp_enable = true
configuration.smtp_enable = true
configuration.smtp_address = smtp.server
configuration.smtp_address = smtp.server
configuration.smtp_port = 4
56
configuration.smtp_port = 4
65
configuration.smtp_user_name = smtp user
configuration.smtp_user_name = smtp user
configuration.smtp_password = smtp password
configuration.smtp_password = smtp password
configuration.smtp_domain = lab.example.com
configuration.smtp_domain = lab.example.com
configuration.smtp_authentication = login
configuration.smtp_authentication = login
configuration.smtp_enable_starttls_auto = true
configuration.smtp_enable_starttls_auto = true
configuration.smtp_openssl_verify_mode = peer
# XXX none insecure -> peer?
configuration.smtp_openssl_verify_mode = none
configuration.default_can_create_group = true
configuration.default_can_create_group = true
configuration.username_changing_enabled = true
configuration.username_changing_enabled = true
...
...
software/gitlab/template/smtp_settings.rb.in
View file @
117f23de
...
@@ -17,5 +17,8 @@ if Rails.env.production?
...
@@ -17,5 +17,8 @@ if Rails.env.production?
authentication: :{{ cfg('smtp_authentication') }},
authentication: :{{ cfg('smtp_authentication') }},
enable_starttls_auto: {{ cfg('smtp_enable_starttls_auto') }},
enable_starttls_auto: {{ cfg('smtp_enable_starttls_auto') }},
openssl_verify_mode: '{{ cfg("smtp_openssl_verify_mode") }}'
openssl_verify_mode: '{{ cfg("smtp_openssl_verify_mode") }}'
# ca_path:
# ca_file:
}
}
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment