Skip to content

Commit 57399b7

Browse files
authored
Merge pull request #3181 from kkimurak/replace-localhost-with-an-explicit-ipv4
Change localhost to 127.0.0.1 in assets/runtime
2 parents b6a853d + 4c4fc65 commit 57399b7

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

assets/runtime/config/gitaly/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,5 @@ dir = "{{GITLAB_SHELL_INSTALL_DIR}}"
9494

9595
[gitlab]
9696
secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
97-
url = "http://localhost:8181{{GITLAB_RELATIVE_URL_ROOT}}"
97+
url = "http://127.0.0.1:8181{{GITLAB_RELATIVE_URL_ROOT}}"
9898

assets/runtime/config/gitlab-pages/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}}
44
auth-secret={{GITLAB_PAGES_ACCESS_SECRET}}
55
gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}
66
artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}
7-
internal-gitlab-server=http://localhost:8181
7+
internal-gitlab-server=http://127.0.0.1:8181
88
api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret

assets/runtime/config/gitlabhq/cable.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
# https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/cable.yml.example
33
development:
44
adapter: redis
5-
url: redis://localhost:6379
5+
url: redis://127.0.0.1:6379
66
channel_prefix: gitlab_development
77
test:
88
adapter: redis
9-
url: redis://localhost:6379
9+
url: redis://127.0.0.1:6379
1010
channel_prefix: gitlab_test
1111
production:
1212
adapter: redis

assets/runtime/config/gitlabhq/resque.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
33
#
44
development:
5-
url: redis://localhost:6379
5+
url: redis://127.0.0.1:6379
66
# sentinels:
77
# -
88
# host: localhost
@@ -11,7 +11,7 @@ development:
1111
# host: slave2
1212
# port: 26381 # point to sentinel, not to redis port
1313
test:
14-
url: redis://localhost:6379
14+
url: redis://127.0.0.1:6379
1515
production:
1616
# Redis (single instance)
1717
url: redis://{{REDIS_HOST}}:{{REDIS_PORT}}/{{REDIS_DB_NUMBER}}

assets/runtime/config/nginx/gitlab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
## See installation.md#using-https for additional HTTPS configuration details.
1818

1919
upstream gitlab-workhorse {
20-
server localhost:8181 fail_timeout=0;
20+
server 127.0.0.1:8181 fail_timeout=0;
2121
}
2222

2323
map $http_upgrade $connection_upgrade_gitlab {

assets/runtime/config/nginx/gitlab-pages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ server {
1515
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
1616
proxy_set_header X-Forwarded-Proto $scheme;
1717
# The same address as passed to GitLab Pages: `-listen-proxy`
18-
proxy_pass http://localhost:8090/;
18+
proxy_pass http://127.0.0.1:8090/;
1919
}
2020
# Define custom error pages
2121
error_page 403 /403.html;

assets/runtime/config/nginx/gitlab-ssl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
## See installation.md#using-https for additional HTTPS configuration details.
2222

2323
upstream gitlab-workhorse {
24-
server localhost:8181 fail_timeout=0;
24+
server 127.0.0.1:8181 fail_timeout=0;
2525
}
2626

2727
map $http_upgrade $connection_upgrade_gitlab_ssl {

assets/runtime/env-defaults

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ GITLAB_DOWNLOADS_DIR="${GITLAB_DOWNLOADS_DIR:-$GITLAB_TEMP_DIR/downloads}"
1515
GITLAB_SHARED_DIR="${GITLAB_SHARED_DIR:-$GITLAB_DATA_DIR/shared}"
1616
GITLAB_DEFAULT_THEME=${GITLAB_DEFAULT_THEME:-2}
1717
GITLAB_HTTPS=${GITLAB_HTTPS:-false}
18-
GITLAB_HOST=${GITLAB_HOST:-localhost}
18+
GITLAB_HOST=${GITLAB_HOST:-127.0.0.1}
1919
GITLAB_CI_HOST=${GITLAB_CI_HOST:-}
2020
GITLAB_PORT=${GITLAB_PORT:-}
2121
GITLAB_IMPERSONATION_ENABLED=${GITLAB_IMPERSONATION_ENABLED:-true}
@@ -270,7 +270,7 @@ GITLAB_REGISTRY_ENABLED=${GITLAB_REGISTRY_ENABLED:-false}
270270
GITLAB_REGISTRY_DIR="${GITLAB_REGISTRY_DIR:-$GITLAB_SHARED_DIR/registry}"
271271
GITLAB_REGISTRY_HOST=${GITLAB_REGISTRY_HOST:-registry.example.com}
272272
GITLAB_REGISTRY_PORT=${GITLAB_REGISTRY_PORT:-443}
273-
GITLAB_REGISTRY_API_URL=${GITLAB_REGISTRY_API_URL:-http://localhost:5000/}
273+
GITLAB_REGISTRY_API_URL=${GITLAB_REGISTRY_API_URL:-http://127.0.0.1:5000/}
274274
GITLAB_REGISTRY_KEY_PATH=${GITLAB_REGISTRY_KEY_PATH:-config/registry.key}
275275
GITLAB_REGISTRY_ISSUER=${GITLAB_REGISTRY_ISSUER:-gitlab-issuer}
276276
GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=${GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES:-false}

0 commit comments

Comments
 (0)