diff --git a/.gitignore b/.gitignore index b8cbfe9966dbf7fbae0ff03f2db7bff234c9562b..231541a22379099131199b17aaae9e4944da15df 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 a5486e450d4bf86b83e2a1e233e7ca42cdc912ef..711fd4ef3c29d910d7140ffd26941c72403fde13 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 df4f49524bc8a31f4bd2b54281a8facfcf53e71c..f3635613339fb5df1aab9f3770f4961278b3dc99 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 affa2ebab2a52e52d28609349172d94c3572da26..aecbc74385efa89250f514b242d390f4aaaa9ba4 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 03bf748b471a9f25ac4a49ca33a534c13a69406a..23bbd0681d67a3f6d31cbc005e2dd551a9a0f0f2 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 = {})