Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a183aa3c
Commit
a183aa3c
authored
Dec 13, 2018
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE-EE parity for prepare_build script
This removes EE-only directives in favor of file existence checks.
parent
07e079e8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
6 deletions
+18
-6
scripts/prepare_build.sh
scripts/prepare_build.sh
+18
-6
No files found.
scripts/prepare_build.sh
View file @
a183aa3c
...
@@ -28,13 +28,25 @@ fi
...
@@ -28,13 +28,25 @@ fi
cp
config/database.yml.
$GITLAB_DATABASE
config/database.yml
cp
config/database.yml.
$GITLAB_DATABASE
config/database.yml
if
[
-f
config/database_geo.yml.
$GITLAB_DATABASE
]
;
then
cp
config/database_geo.yml.
$GITLAB_DATABASE
config/database_geo.yml
fi
# Set user to a non-superuser to ensure we test permissions
# Set user to a non-superuser to ensure we test permissions
sed
-i
's/username: root/username: gitlab/g'
config/database.yml
sed
-i
's/username: root/username: gitlab/g'
config/database.yml
if
[
"
$GITLAB_DATABASE
"
=
'postgresql'
]
;
then
if
[
"
$GITLAB_DATABASE
"
=
'postgresql'
]
;
then
sed
-i
's/localhost/postgres/g'
config/database.yml
sed
-i
's/localhost/postgres/g'
config/database.yml
if
[
-f
config/database_geo.yml
]
;
then
sed
-i
's/localhost/postgres/g'
config/database_geo.yml
fi
else
# Assume it's mysql
else
# Assume it's mysql
sed
-i
's/localhost/mysql/g'
config/database.yml
sed
-i
's/localhost/mysql/g'
config/database.yml
if
[
-f
config/database_geo.yml
]
;
then
sed
-i
's/localhost/mysql/g'
config/database_geo.yml
fi
fi
fi
cp
config/resque.yml.example config/resque.yml
cp
config/resque.yml.example config/resque.yml
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment