Merge branch 'support-ee-mr-3831' into 'master'

Update the Geo DB schema path

See merge request gitlab-org/omnibus-gitlab!2234

config/software/gitlab-rails.rb

@@ -171,7 +171,7 @@ build do
   # keep a copy of schema.rb around in case we need it. (I am looking at you,
   # mysql-postgresql-converter.)
   copy 'db/schema.rb', 'db/schema.rb.bundled'
-  copy 'db/geo/schema.rb', 'db/geo/schema.rb.bundled' if EE
+  copy 'ee/db/geo/schema.rb', 'ee/db/geo/schema.rb.bundled' if EE
   command "mkdir -p #{install_dir}/embedded/service/gitlab-rails"
   sync './', "#{install_dir}/embedded/service/gitlab-rails/", exclude: ['.git', '.gitignore', 'spec', 'features', 'qa', 'rubocop']

files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb

@@ -40,6 +40,6 @@ templatesymlink 'Create a database_geo.yml and create a symlink to Rails root' d
 end
 # Make schema.rb writable for when we run `rake geo:db:migrate`
-file '/opt/gitlab/embedded/service/gitlab-rails/db/geo/schema.rb' do
+file '/opt/gitlab/embedded/service/gitlab-rails/ee/db/geo/schema.rb' do
   owner gitlab_user
 end