Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gitlab
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
infra
ansible
roles
gitlab
Commits
fba5a826
Verified
Commit
fba5a826
authored
Jan 30, 2022
by
Julian
Browse files
Options
Downloads
Patches
Plain Diff
Add options pages_headers and mail.from
parent
939ac045
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.md
+3
-0
3 additions, 0 deletions
README.md
defaults/main.yml
+3
-0
3 additions, 0 deletions
defaults/main.yml
templates/gitlab.rb.j2
+4
-2
4 additions, 2 deletions
templates/gitlab.rb.j2
with
10 additions
and
2 deletions
README.md
+
3
−
0
View file @
fba5a826
...
@@ -40,6 +40,9 @@ pages_listen_ssl: []
...
@@ -40,6 +40,9 @@ pages_listen_ssl: []
# listen_proxy only supports a single bind like 'localhost:8080'
# listen_proxy only supports a single bind like 'localhost:8080'
pages_listen_proxy: ''
pages_listen_proxy: ''
# add http headers for all gitlab pages sites
pages_headers: ['Referrer-Policy: same-origin', 'Strict-Transport-Security: max-age=63072000']
# external url for the container registry, set to Null to disable
# external url for the container registry, set to Null to disable
registry_external_url: ~
registry_external_url: ~
...
...
This diff is collapsed.
Click to expand it.
defaults/main.yml
+
3
−
0
View file @
fba5a826
...
@@ -9,6 +9,7 @@ gitlab:
...
@@ -9,6 +9,7 @@ gitlab:
pages_listen
:
[]
pages_listen
:
[]
pages_listen_ssl
:
[]
pages_listen_ssl
:
[]
pages_listen_proxy
:
'
localhost:11181'
pages_listen_proxy
:
'
localhost:11181'
pages_headers
:
[]
registry_path
:
~
registry_path
:
~
registry_external_url
:
~
registry_external_url
:
~
artifacts_path
:
~
artifacts_path
:
~
...
@@ -27,3 +28,5 @@ gitlab:
...
@@ -27,3 +28,5 @@ gitlab:
auto_link_ldap_user
:
'
true'
auto_link_ldap_user
:
'
true'
providers
:
[]
providers
:
[]
upload_size_max
:
128M
upload_size_max
:
128M
mail
:
{}
#from: 'git@domain'
This diff is collapsed.
Click to expand it.
templates/gitlab.rb.j2
+
4
−
2
View file @
fba5a826
...
@@ -72,7 +72,9 @@ gitlab_rails['gitlab_ssh_host'] = '{{ gitlab.gitlab_ssh_host }}'
...
@@ -72,7 +72,9 @@ gitlab_rails['gitlab_ssh_host'] = '{{ gitlab.gitlab_ssh_host }}'
### Email Settings
### Email Settings
# gitlab_rails['gitlab_email_enabled'] = true
# gitlab_rails['gitlab_email_enabled'] = true
# gitlab_rails['gitlab_email_from'] = 'example@example.com'
{% if gitlab.mail.from %}
gitlab_rails['gitlab_email_from'] = '{{ gitlab.mail.from }}'
{% endif %}
# gitlab_rails['gitlab_email_display_name'] = 'Example'
# gitlab_rails['gitlab_email_display_name'] = 'Example'
# gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com'
# gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com'
# gitlab_rails['gitlab_email_subject_suffix'] = ''
# gitlab_rails['gitlab_email_subject_suffix'] = ''
...
@@ -1461,7 +1463,7 @@ gitlab_pages['access_control'] = true
...
@@ -1461,7 +1463,7 @@ gitlab_pages['access_control'] = true
# gitlab_pages['gitlab_client_jwt_expiry'] = "30s"
# gitlab_pages['gitlab_client_jwt_expiry'] = "30s"
##! Define custom gitlab-pages HTTP headers for the whole instance
##! Define custom gitlab-pages HTTP headers for the whole instance
#
gitlab_pages['headers'] =
[]
gitlab_pages['headers'] =
{{ gitlab.pages_headers|to_json }}
##! Shared secret used for authentication between Pages and GitLab
##! Shared secret used for authentication between Pages and GitLab
# gitlab_pages['api_secret_key'] = nil # Will be generated if not set. Base64 encoded and exactly 32 bytes long.
# gitlab_pages['api_secret_key'] = nil # Will be generated if not set. Base64 encoded and exactly 32 bytes long.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment