Skip to content
Snippets Groups Projects
Commit 7d46205a authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'ngala/596-pages-auth-timeout' into 'master'

Add auth-timeout flag in Gitlab Pages

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7268



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarClemens Beck <cbeck@gitlab.com>
Co-authored-by: default avatarngala <ngala@gitlab.com>
parents 722994a3 162183b7
No related branches found
No related tags found
3 merge requests!119heptapod#1448: making Heptapod 1.1 the new oldstable,!116heptapod#1395: make 1.1 the new stable,!115Merged upstream 16.7 stable branches first commit
......@@ -1907,6 +1907,7 @@
# gitlab_pages['internal_gitlab_server'] = nil # Defaults to gitlab_server, can be changed to internal load balancer
# gitlab_pages['auth_secret'] = nil # Generated if not present
# gitlab_pages['auth_scope'] = nil # Defaults to api, can be changed to read_api to increase security
# gitlab_pages['auth_timeout'] = "5s" # GitLab application client timeout for authentication
# gitlab_pages['auth_cookie_session_timeout'] = "10m" # Authentication cookie session timeout (truncated to seconds). A zero value means the cookie will be deleted after the browser session ends
##! GitLab Pages Server Shutdown Timeout
......
......@@ -33,6 +33,7 @@
default['gitlab_pages']['auth_redirect_uri'] = nil
default['gitlab_pages']['auth_secret'] = nil
default['gitlab_pages']['auth_scope'] = nil
default['gitlab_pages']['auth_timeout'] = nil
default['gitlab_pages']['auth_cookie_session_timeout'] = nil
default['gitlab_pages']['insecure_ciphers'] = false
default['gitlab_pages']['tls_min_version'] = nil
......
......@@ -17,6 +17,9 @@
<%- if @auth_scope -%>
auth-scope=<%= @auth_scope %>
<%- end -%>
<%- if @auth_timeout -%>
auth-timeout=<%= @auth_timeout %>
<%- end -%>
<%- if @auth_cookie_session_timeout -%>
auth-cookie-session-timeout=<%= @auth_cookie_session_timeout %>
<%- end -%>
......
......@@ -214,6 +214,7 @@
auth_secret: 'auth_secret',
auth_redirect_uri: 'https://projects.pages.example.com/auth',
auth_scope: 'read_api',
auth_timeout: '10s',
auth_cookie_session_timeout: '20m',
access_control: true,
insecure_ciphers: true,
......@@ -271,6 +272,7 @@
auth-client-secret=app_secret
auth-secret=auth_secret
auth-scope=read_api
auth-timeout=10s
auth-cookie-session-timeout=20m
zip-cache-expiration=120s
zip-cache-cleanup=1m
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment