Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
omnibus-heptapod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
heptapod
omnibus-heptapod
Commits
aab30281
Commit
aab30281
authored
3 years ago
by
Douglas Barbosa Alexandre
Browse files
Options
Downloads
Patches
Plain Diff
Switch to supporting the new ee/db/geo/structure.sql
Changelog: changed
parent
8a7c03c5
No related branches found
No related tags found
2 merge requests
!55
Intermediate build after shift of stable series
,
!54
GitLab 14.4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
config/software/gitlab-rails.rb
+2
-2
2 additions, 2 deletions
config/software/gitlab-rails.rb
files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb
+2
-2
2 additions, 2 deletions
files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb
with
4 additions
and
4 deletions
config/software/gitlab-rails.rb
+
2
−
2
View file @
aab30281
...
@@ -184,6 +184,6 @@
...
@@ -184,6 +184,6 @@
command
"find
#{
install_dir
}
/embedded/lib/ruby/gems -name 'doc' -type d -print -exec rm -r {} +"
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,
# Because db/structure.sql is modified by `rake db:migrate` after installation,
# keep a copy of s
chema.rb
around in case we need it. (I am looking at you,
# keep a copy of s
tructure.sql
around in case we need it. (I am looking at you,
# mysql-postgresql-converter.)
# mysql-postgresql-converter.)
copy
'db/structure.sql'
,
'db/structure.sql.bundled'
copy
'db/structure.sql'
,
'db/structure.sql.bundled'
...
@@ -188,6 +188,6 @@
...
@@ -188,6 +188,6 @@
# mysql-postgresql-converter.)
# mysql-postgresql-converter.)
copy
'db/structure.sql'
,
'db/structure.sql.bundled'
copy
'db/structure.sql'
,
'db/structure.sql.bundled'
copy
'ee/db/geo/s
chema.rb
'
,
'ee/db/geo/s
chema.rb
.bundled'
if
EE
copy
'ee/db/geo/s
tructure.sql
'
,
'ee/db/geo/s
tructure.sql
.bundled'
if
EE
command
"mkdir -p
#{
install_dir
}
/embedded/service/gitlab-rails"
command
"mkdir -p
#{
install_dir
}
/embedded/service/gitlab-rails"
sync
'./'
,
"
#{
install_dir
}
/embedded/service/gitlab-rails/"
,
exclude:
%w(
sync
'./'
,
"
#{
install_dir
}
/embedded/service/gitlab-rails/"
,
exclude:
%w(
...
...
This diff is collapsed.
Click to expand it.
files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb
+
2
−
2
View file @
aab30281
...
@@ -50,8 +50,8 @@
...
@@ -50,8 +50,8 @@
action
:nothing
action
:nothing
end
end
# Make s
chema.rb
writable for when we run `rake geo:db:migrate`
# Make s
tructure.sql
writable for when we run `rake geo:db:migrate`
file
'/opt/gitlab/embedded/service/gitlab-rails/ee/db/geo/s
chema.rb
'
do
file
'/opt/gitlab/embedded/service/gitlab-rails/ee/db/geo/s
tructure.sql
'
do
owner
gitlab_user
owner
gitlab_user
end
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment