diff --git a/config/software/gitlab-rails.rb b/config/software/gitlab-rails.rb index 8a7c03c50a2c42e7c04752a369c88320d2f01010_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1yYWlscy5yYg==..aab3028178cc63bc2709dc57aeebc7a0a187c8e3_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1yYWlscy5yYg== 100644 --- a/config/software/gitlab-rails.rb +++ b/config/software/gitlab-rails.rb @@ -184,6 +184,6 @@ command "find #{install_dir}/embedded/lib/ruby/gems -name 'doc' -type d -print -exec rm -r {} +" # Because db/structure.sql is modified by `rake db:migrate` after installation, - # keep a copy of schema.rb around in case we need it. (I am looking at you, + # keep a copy of structure.sql around in case we need it. (I am looking at you, # mysql-postgresql-converter.) copy 'db/structure.sql', 'db/structure.sql.bundled' @@ -188,6 +188,6 @@ # mysql-postgresql-converter.) copy 'db/structure.sql', 'db/structure.sql.bundled' - copy 'ee/db/geo/schema.rb', 'ee/db/geo/schema.rb.bundled' if EE + copy 'ee/db/geo/structure.sql', 'ee/db/geo/structure.sql.bundled' if EE command "mkdir -p #{install_dir}/embedded/service/gitlab-rails" sync './', "#{install_dir}/embedded/service/gitlab-rails/", exclude: %w( diff --git a/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb b/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb index 8a7c03c50a2c42e7c04752a369c88320d2f01010_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvcmVjaXBlcy9nZW8tc2Vjb25kYXJ5LnJi..aab3028178cc63bc2709dc57aeebc7a0a187c8e3_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvcmVjaXBlcy9nZW8tc2Vjb25kYXJ5LnJi 100644 --- a/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb +++ b/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb @@ -50,8 +50,8 @@ action :nothing end -# Make schema.rb writable for when we run `rake geo:db:migrate` -file '/opt/gitlab/embedded/service/gitlab-rails/ee/db/geo/schema.rb' do +# Make structure.sql writable for when we run `rake geo:db:migrate` +file '/opt/gitlab/embedded/service/gitlab-rails/ee/db/geo/structure.sql' do owner gitlab_user end