From 4c4fc65632b2d71fbe7c4056d37aae06fd4502f6 Mon Sep 17 00:00:00 2001 From: Thomas Hiller Date: Tue, 21 Oct 2025 07:54:03 +0000 Subject: [PATCH] change localhost to 127.0.0.1 in assets/runtime squash following commits: - 32f5332b05a6064169e6cc07d9c4a60b6a3dc7c5 for configgitlab-pages/config - f974a0197c74ca17343e5e3ff99a633347d8ad67 for config/gitlab-shell/config.yml - 1104bacb29ed7f20bdf20015552299bd08ae7313 for config/gitlabhq/cable.yml - 6ce37d8706cb289136385a7c498ad8c42faaab2c for config/gitlabhq/resque.yml - 7336e042728f63da2cc302b6fd6f975eb26566dc for config/nginx/gitlab - 1f39dcaabe7d3daa3b70ef0ae98ea8e30659e1e0 for config/nginx/gitlab-pages - 76aaf571e992c6e5b970a437f8c46158d9867d65 for config/nginx/gitlab-ssl - 549f717ec0810c8e11f30fb40f08997c0b84b5e3 for env-defaults but without KAS-related configs (original: add WEBTOKEN secret, remove GITLAB_KAS_SECRET) --- assets/runtime/config/gitaly/config.toml | 2 +- assets/runtime/config/gitlab-pages/config | 2 +- assets/runtime/config/gitlabhq/cable.yml | 4 ++-- assets/runtime/config/gitlabhq/resque.yml | 4 ++-- assets/runtime/config/nginx/gitlab | 2 +- assets/runtime/config/nginx/gitlab-pages | 2 +- assets/runtime/config/nginx/gitlab-ssl | 2 +- assets/runtime/env-defaults | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/assets/runtime/config/gitaly/config.toml b/assets/runtime/config/gitaly/config.toml index 0b070505..8cc1400d 100644 --- a/assets/runtime/config/gitaly/config.toml +++ b/assets/runtime/config/gitaly/config.toml @@ -94,5 +94,5 @@ dir = "{{GITLAB_SHELL_INSTALL_DIR}}" [gitlab] secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" -url = "http://localhost:8181{{GITLAB_RELATIVE_URL_ROOT}}" +url = "http://127.0.0.1:8181{{GITLAB_RELATIVE_URL_ROOT}}" diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config index 40978609..3377ed1c 100644 --- a/assets/runtime/config/gitlab-pages/config +++ b/assets/runtime/config/gitlab-pages/config @@ -4,5 +4,5 @@ auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}} auth-secret={{GITLAB_PAGES_ACCESS_SECRET}} gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}} artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}} -internal-gitlab-server=http://localhost:8181 +internal-gitlab-server=http://127.0.0.1:8181 api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret diff --git a/assets/runtime/config/gitlabhq/cable.yml b/assets/runtime/config/gitlabhq/cable.yml index d36e74fe..e59afed6 100644 --- a/assets/runtime/config/gitlabhq/cable.yml +++ b/assets/runtime/config/gitlabhq/cable.yml @@ -2,11 +2,11 @@ # https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/cable.yml.example development: adapter: redis - url: redis://localhost:6379 + url: redis://127.0.0.1:6379 channel_prefix: gitlab_development test: adapter: redis - url: redis://localhost:6379 + url: redis://127.0.0.1:6379 channel_prefix: gitlab_test production: adapter: redis diff --git a/assets/runtime/config/gitlabhq/resque.yml b/assets/runtime/config/gitlabhq/resque.yml index 7a668153..1d7349e2 100644 --- a/assets/runtime/config/gitlabhq/resque.yml +++ b/assets/runtime/config/gitlabhq/resque.yml @@ -2,7 +2,7 @@ # a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests # development: - url: redis://localhost:6379 + url: redis://127.0.0.1:6379 # sentinels: # - # host: localhost @@ -11,7 +11,7 @@ development: # host: slave2 # port: 26381 # point to sentinel, not to redis port test: - url: redis://localhost:6379 + url: redis://127.0.0.1:6379 production: # Redis (single instance) url: redis://{{REDIS_HOST}}:{{REDIS_PORT}}/{{REDIS_DB_NUMBER}} diff --git a/assets/runtime/config/nginx/gitlab b/assets/runtime/config/nginx/gitlab index 75001235..185ee045 100644 --- a/assets/runtime/config/nginx/gitlab +++ b/assets/runtime/config/nginx/gitlab @@ -17,7 +17,7 @@ ## See installation.md#using-https for additional HTTPS configuration details. upstream gitlab-workhorse { - server localhost:8181 fail_timeout=0; + server 127.0.0.1:8181 fail_timeout=0; } map $http_upgrade $connection_upgrade_gitlab { diff --git a/assets/runtime/config/nginx/gitlab-pages b/assets/runtime/config/nginx/gitlab-pages index 6f2978dd..c9f006c3 100644 --- a/assets/runtime/config/nginx/gitlab-pages +++ b/assets/runtime/config/nginx/gitlab-pages @@ -15,7 +15,7 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; # The same address as passed to GitLab Pages: `-listen-proxy` - proxy_pass http://localhost:8090/; + proxy_pass http://127.0.0.1:8090/; } # Define custom error pages error_page 403 /403.html; diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl index 1057e092..b52b86a6 100644 --- a/assets/runtime/config/nginx/gitlab-ssl +++ b/assets/runtime/config/nginx/gitlab-ssl @@ -21,7 +21,7 @@ ## See installation.md#using-https for additional HTTPS configuration details. upstream gitlab-workhorse { - server localhost:8181 fail_timeout=0; + server 127.0.0.1:8181 fail_timeout=0; } map $http_upgrade $connection_upgrade_gitlab_ssl { diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index d3269e8e..275aaf5c 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -15,7 +15,7 @@ GITLAB_DOWNLOADS_DIR="${GITLAB_DOWNLOADS_DIR:-$GITLAB_TEMP_DIR/downloads}" GITLAB_SHARED_DIR="${GITLAB_SHARED_DIR:-$GITLAB_DATA_DIR/shared}" GITLAB_DEFAULT_THEME=${GITLAB_DEFAULT_THEME:-2} GITLAB_HTTPS=${GITLAB_HTTPS:-false} -GITLAB_HOST=${GITLAB_HOST:-localhost} +GITLAB_HOST=${GITLAB_HOST:-127.0.0.1} GITLAB_CI_HOST=${GITLAB_CI_HOST:-} GITLAB_PORT=${GITLAB_PORT:-} GITLAB_IMPERSONATION_ENABLED=${GITLAB_IMPERSONATION_ENABLED:-true} @@ -270,7 +270,7 @@ GITLAB_REGISTRY_ENABLED=${GITLAB_REGISTRY_ENABLED:-false} GITLAB_REGISTRY_DIR="${GITLAB_REGISTRY_DIR:-$GITLAB_SHARED_DIR/registry}" GITLAB_REGISTRY_HOST=${GITLAB_REGISTRY_HOST:-registry.example.com} GITLAB_REGISTRY_PORT=${GITLAB_REGISTRY_PORT:-443} -GITLAB_REGISTRY_API_URL=${GITLAB_REGISTRY_API_URL:-http://localhost:5000/} +GITLAB_REGISTRY_API_URL=${GITLAB_REGISTRY_API_URL:-http://127.0.0.1:5000/} GITLAB_REGISTRY_KEY_PATH=${GITLAB_REGISTRY_KEY_PATH:-config/registry.key} GITLAB_REGISTRY_ISSUER=${GITLAB_REGISTRY_ISSUER:-gitlab-issuer} GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=${GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES:-false}