From 477ba2b3465736cdccfb6cb6a36f78447942e310 Mon Sep 17 00:00:00 2001 From: Krasimir Angelov Date: Fri, 6 Sep 2019 16:06:25 +1200 Subject: Add skeleton Pages internal API Basic `/internal/pages` endpoint that will be used for Pages virtual domains internal API. The endpoint is currently behind feature flag and provides authetication similar to how Workhorse is authenticating with the GitLab. --- config/gitlab.yml.example | 3 +++ config/initializers/1_settings.rb | 1 + 2 files changed, 4 insertions(+) (limited to 'config') diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index e3693f612e3..aa7c2d343a8 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -321,6 +321,9 @@ production: &base # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages admin: address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) + # 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 ## Mattermost ## For enabling Add to Mattermost button diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 4160f488a7a..dbbb7ba1b60 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -292,6 +292,7 @@ Settings.pages['artifacts_server'] ||= Settings.pages['enabled'] if Settings.pa Settings.pages['admin'] ||= Settingslogic.new({}) Settings.pages.admin['certificate'] ||= '' +Settings.pages['secret_file'] ||= Rails.root.join('.gitlab_pages_shared_secret') # # Geo -- cgit v1.2.3