diff --git a/config/software/gitlab-rails.rb b/config/software/gitlab-rails.rb index a76d11a09361cc8294a2682b80c1b780d6bf627c_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1yYWlscy5yYg==..f8a075a2aa510e0d9b3a26917c86cf54524db56a_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1yYWlscy5yYg== 100644 --- a/config/software/gitlab-rails.rb +++ b/config/software/gitlab-rails.rb @@ -171,7 +171,7 @@ # 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'] diff --git a/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb b/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb index a76d11a09361cc8294a2682b80c1b780d6bf627c_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvcmVjaXBlcy9nZW8tc2Vjb25kYXJ5LnJi..f8a075a2aa510e0d9b3a26917c86cf54524db56a_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvcmVjaXBlcy9nZW8tc2Vjb25kYXJ5LnJi 100644 --- a/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb +++ b/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb @@ -40,6 +40,6 @@ 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