Move pages object storage settings to gitlab_rails

files/gitlab-config-template/gitlab.rb.template

@@ -393,6 +393,21 @@ gitlab_rails['object_store']['objects']['pages']['bucket'] = nil
 #   # 'path_style' => false # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
 # }
+### GitLab Pages
+# gitlab_rails['pages_object_store_enabled'] = false
+# gitlab_rails['pages_object_store_remote_directory'] = "pages"
+# gitlab_rails['pages_object_store_connection'] = {
+#   'provider' => 'AWS',
+#   'region' => 'eu-west-1',
+#   'aws_access_key_id' => 'AWS_ACCESS_KEY_ID',
+#   'aws_secret_access_key' => 'AWS_SECRET_ACCESS_KEY',
+#   # # The below options configure an S3 compatible host instead of AWS
+#   # 'host' => 's3.amazonaws.com',
+#   # 'aws_signature_version' => 4, # For creation of signed URLs. Set to 2 if provider does not support v4.
+#   # 'endpoint' => 'https://s3.amazonaws.com', # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces
+#   # 'path_style' => false # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
+# }
+
 ### Impersonation settings
 # gitlab_rails['impersonation_enabled'] = true
@@ -1517,21 +1532,6 @@ gitlab_rails['object_store']['objects']['pages']['bucket'] = nil
 #   'SSL_CERT_DIR' => "#{node['package']['install-dir']}/embedded/ssl/certs/"
 # }
-##! Object storage settings
-# gitlab_pages['object_store_enabled'] = false
-# gitlab_pages['object_store_remote_directory'] = "pages"
-# gitlab_pages['object_store_connection'] = {
-#   'provider' => 'AWS',
-#   'region' => 'eu-west-1',
-#   'aws_access_key_id' => 'AWS_ACCESS_KEY_ID',
-#   'aws_secret_access_key' => 'AWS_SECRET_ACCESS_KEY',
-#   # # The below options configure an S3 compatible host instead of AWS
-#   # 'host' => 's3.amazonaws.com',
-#   # 'aws_signature_version' => 4, # For creation of signed URLs. Set to 2 if provider does not support v4.
-#   # 'endpoint' => 'https://s3.amazonaws.com', # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces
-#   # 'path_style' => false # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
-# }
-
 ################################################################################
 ## GitLab Pages NGINX
 ################################################################################

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -264,6 +264,9 @@ default['gitlab']['gitlab-rails']['pages_host'] = nil
 default['gitlab']['gitlab-rails']['pages_port'] = nil
 default['gitlab']['gitlab-rails']['pages_https'] = false
 default['gitlab']['gitlab-rails']['pages_path'] = nil
+default['gitlab']['gitlab-rails']['pages_object_store_enabled'] = false
+default['gitlab']['gitlab-rails']['pages_object_store_remote_directory'] = 'pages'
+default['gitlab']['gitlab-rails']['pages_object_store_connection'] = {}
 default['gitlab']['gitlab-rails']['registry_enabled'] = false
 default['gitlab']['gitlab-rails']['registry_host'] = nil
 default['gitlab']['gitlab-rails']['registry_port'] = nil
@@ -686,9 +689,6 @@ default['gitlab']['gitlab-pages']['gitlab_client_http_timeout'] = nil
 default['gitlab']['gitlab-pages']['gitlab_client_jwt_expiry'] = nil
 default['gitlab']['gitlab-pages']['domain_config_source'] = nil
 default['gitlab']['gitlab-pages']['env_directory'] = '/opt/gitlab/etc/gitlab-pages/env'
-default['gitlab']['gitlab-pages']['object_store_enabled'] = false
-default['gitlab']['gitlab-pages']['object_store_remote_directory'] = 'pages'
-default['gitlab']['gitlab-pages']['object_store_connection'] = {}
 ####
 # Nginx

files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb

@@ -298,9 +298,9 @@ templatesymlink "Create a gitlab.yml and create a symlink to Rails root" do
       pages_external_https: node['gitlab']['gitlab-pages']['external_https'],
       pages_artifacts_server: node['gitlab']['gitlab-pages']['artifacts_server'],
       pages_access_control: node['gitlab']['gitlab-pages']['access_control'],
-      pages_object_store_enabled: node['gitlab']['gitlab-pages']['object_store_enabled'],
-      pages_object_store_remote_directory: node['gitlab']['gitlab-pages']['object_store_remote_directory'],
-      pages_object_store_connection: node['gitlab']['gitlab-pages']['object_store_connection'],
+      pages_object_store_enabled: node['gitlab']['gitlab-rails']['pages_object_store_enabled'],
+      pages_object_store_remote_directory: node['gitlab']['gitlab-rails']['pages_object_store_remote_directory'],
+      pages_object_store_connection: node['gitlab']['gitlab-rails']['pages_object_store_connection'],
       mattermost_host: mattermost_host,
       mattermost_enabled: node['mattermost']['enable'] || !mattermost_host.nil?,
       sidekiq: node['gitlab']['sidekiq'],

spec/chef/recipes/gitlab-rails_spec.rb

@@ -746,10 +746,10 @@ RSpec.describe 'gitlab::gitlab-rails' do
       context 'with values' do
         before do
-          stub_gitlab_rb(gitlab_pages: {
-                           object_store_enabled: true,
-                           object_store_remote_directory: 'pagescustomdir',
-                           object_store_connection: aws_connection_hash
+          stub_gitlab_rb(gitlab_rails: {
+                           pages_object_store_enabled: true,
+                           pages_object_store_remote_directory: 'pagescustomdir',
+                           pages_object_store_connection: aws_connection_hash
                          })
         end