Skip to content

Fix nginx configuration #3072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2025
Merged

Fix nginx configuration #3072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion assets/runtime/config/nginx/gitlab-pages-ssl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ server {
## Pages serving host
server {
listen 0.0.0.0:443 ssl;
listen [::]:443 ssl http2;
listen [::]:443 ssl;
http2 on;

## Replace this with something like pages.gitlab.com
server_name ~^.*{{GITLAB_PAGES_DOMAIN}};
Expand Down
7 changes: 4 additions & 3 deletions assets/runtime/config/nginx/gitlab-registry
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ server {
server_name {{GITLAB_REGISTRY_HOST}};
server_tokens off; ## Don't show the nginx version number, a security best practice
return 301 https://$http_host:$request_uri;
access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log gitlab_access;
access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log;
error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_error.log;
}

server {
# If a different port is specified in https://gitlab.com/gitlab-org/gitlab-foss/blob/8-8-stable/config/gitlab.yml.example#L182,
# it should be declared here as well
listen *:{{GITLAB_REGISTRY_PORT}} ssl http2;
listen *:{{GITLAB_REGISTRY_PORT}} ssl;
http2 on;
server_name {{GITLAB_REGISTRY_HOST}};
server_tokens off; ## Don't show the nginx version number, a security best practice

Expand All @@ -36,7 +37,7 @@ server {
ssl_session_cache builtin:1000 shared:SSL:10m;
ssl_session_timeout 5m;

access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log gitlab_access;
access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log;
error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_error.log;

location / {
Expand Down
5 changes: 3 additions & 2 deletions assets/runtime/config/nginx/gitlab-ssl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ server {

## HTTPS host
server {
listen 0.0.0.0:443 ssl http2;
listen [::]:443 ipv6only=on ssl http2 default_server;
listen 0.0.0.0:443 ssl;
listen [::]:443 ipv6only=on ssl default_server;
http2 on;
server_name {{GITLAB_HOST}}; ## Replace this with something like gitlab.example.com
server_tokens off; ## Don't show the nginx version number, a security best practice

Expand Down