From 70cfc82d7450b0a7dbe51ee5db1a18fbfa872b77 Mon Sep 17 00:00:00 2001
From: Krasimir Angelov <kangelov@gitlab.com>
Date: Thu, 21 Nov 2019 17:32:04 +1300
Subject: [PATCH] Rename .gitlab_pages_shared_secret to .gitlab_pages_secret
to match the file generated by Omnibus.
See https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/3705
---
.gitignore | 2 +-
config/gitlab.yml.example | 4 ++--
config/initializers/1_settings.rb | 2 +-
spec/lib/gitlab/pages_spec.rb | 4 ++--
spec/requests/api/internal/pages_spec.rb | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index b8cbfe9966dbf..231541a223790 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,7 +66,7 @@ eslint-report.html
/vendor/gitaly-ruby
/builds*
/.gitlab_workhorse_secret
-/.gitlab_pages_shared_secret
+/.gitlab_pages_secret
/webpack-report/
/knapsack/
/rspec_flaky/
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index a5486e450d4bf..711fd4ef3c29d 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -321,8 +321,8 @@ production: &base
# external_https: ["1.1.1.1:443", "[2001::1]:443"] # 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_shared_secret' relative to Rails.root (i.e. root of the GitLab app).
- # secret_file: /home/git/gitlab/.gitlab_pages_shared_secret
+ # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app).
+ # secret_file: /home/git/gitlab/.gitlab_pages_secret
## Mattermost
## For enabling Add to Mattermost button
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index df4f49524bc8a..f3635613339fb 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -291,7 +291,7 @@
Settings.pages['external_http'] ||= false unless Settings.pages['external_http'].present?
Settings.pages['external_https'] ||= false unless Settings.pages['external_https'].present?
Settings.pages['artifacts_server'] ||= Settings.pages['enabled'] if Settings.pages['artifacts_server'].nil?
-Settings.pages['secret_file'] ||= Rails.root.join('.gitlab_pages_shared_secret')
+Settings.pages['secret_file'] ||= Rails.root.join('.gitlab_pages_secret')
#
# Geo
diff --git a/spec/lib/gitlab/pages_spec.rb b/spec/lib/gitlab/pages_spec.rb
index affa2ebab2a52..aecbc74385efa 100644
--- a/spec/lib/gitlab/pages_spec.rb
+++ b/spec/lib/gitlab/pages_spec.rb
@@ -3,10 +3,10 @@
require 'spec_helper'
describe Gitlab::Pages do
- let(:pages_shared_secret) { SecureRandom.random_bytes(Gitlab::Pages::SECRET_LENGTH) }
+ let(:pages_secret) { SecureRandom.random_bytes(Gitlab::Pages::SECRET_LENGTH) }
before do
- allow(described_class).to receive(:secret).and_return(pages_shared_secret)
+ allow(described_class).to receive(:secret).and_return(pages_secret)
end
describe '.verify_api_request' do
diff --git a/spec/requests/api/internal/pages_spec.rb b/spec/requests/api/internal/pages_spec.rb
index 03bf748b471a9..23bbd0681d67a 100644
--- a/spec/requests/api/internal/pages_spec.rb
+++ b/spec/requests/api/internal/pages_spec.rb
@@ -4,10 +4,10 @@
describe API::Internal::Pages do
describe "GET /internal/pages" do
- let(:pages_shared_secret) { SecureRandom.random_bytes(Gitlab::Pages::SECRET_LENGTH) }
+ let(:pages_secret) { SecureRandom.random_bytes(Gitlab::Pages::SECRET_LENGTH) }
before do
- allow(Gitlab::Pages).to receive(:secret).and_return(pages_shared_secret)
+ allow(Gitlab::Pages).to receive(:secret).and_return(pages_secret)
end
def query_host(host, headers = {})
--
GitLab