diff options
Diffstat (limited to 'www/gitlab/files/patch-config_gitlab.yml.example')
| -rw-r--r-- | www/gitlab/files/patch-config_gitlab.yml.example | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 3ace91d53c65..f0b65a5d7342 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2025-05-14 17:45:50 UTC +--- config/gitlab.yml.example.orig 2026-02-18 17:09:38 UTC +++ config/gitlab.yml.example -@@ -489,7 +489,7 @@ production: &base +@@ -546,7 +546,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,27 +9,16 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -499,9 +499,9 @@ production: &base - host: example.com - port: 80 # Set to 443 if you serve the pages with HTTPS - https: false # Set to true if you serve the pages with HTTPS -- artifacts_server: true # Set to false if you want to disable online view of HTML artifacts -- # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages -- # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages -+ artifacts_server: false # Set to false if you want to disable online view of HTML artifacts -+ external_http: ["127.0.0.1:8090"] # If defined, enables custom domain support in GitLab Pages -+ # external_https: ["127.0.0.1:8090"] # If defined, enables custom domain and certificate support in GitLab Pages - - # File that contains the shared secret key for verifying access for gitlab-pages. - # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -1233,13 +1233,13 @@ production: &base +@@ -1318,7 +1318,7 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: - gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). + gitaly_address: unix:%%WWWDIR%%/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). - # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. - + # For DNS-based load balancing with TLS, use: dns+tls://[authority_host]:[authority_port]/[host]:[port] + # The host:port portion will be used as the TLS server name for SNI. + # Example: dns+tls://1.1.1.1/gitaly.example.com:8075 +@@ -1327,7 +1327,7 @@ production: &base ## Backup settings backup: path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) @@ -38,7 +27,7 @@ # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) # pg_schema: public # default: nil, it means that all schemas will be backed up -@@ -1274,12 +1274,12 @@ production: &base +@@ -1362,12 +1362,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -54,16 +43,16 @@ # Git over HTTP upload_pack: true -@@ -1294,7 +1294,7 @@ production: &base +@@ -1382,7 +1382,7 @@ production: &base workhorse: # File that contains the secret key for verifying access for gitlab-workhorse. # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_workhorse_secret + # secret_file: %%WWWDIR%%/.gitlab_workhorse_secret - cell: - # enabled: false -@@ -1312,7 +1312,7 @@ production: &base + database_traffic_capture: + config: +@@ -1408,7 +1408,7 @@ production: &base # enabled: true # File that contains the secret key for verifying access for gitlab-kas. # Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app). @@ -72,7 +61,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1339,13 +1339,13 @@ production: &base +@@ -1430,13 +1430,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -88,7 +77,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1366,18 +1366,18 @@ production: &base +@@ -1457,18 +1457,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -114,7 +103,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1604,13 +1604,13 @@ test: +@@ -1695,13 +1695,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: |