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
0
Merge Requests
0
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
iv
gitlab-ce
Commits
635982a8
Commit
635982a8
authored
May 07, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3871 from axilleas/backup-fix
Fix errors during backup task. Fix #3785
parents
af5d0e9e
13dcc390
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
doc/install/installation.md
doc/install/installation.md
+4
-0
lib/backup/database.rb
lib/backup/database.rb
+1
-1
No files found.
doc/install/installation.md
View file @
635982a8
...
@@ -169,6 +169,10 @@ do so with caution!
...
@@ -169,6 +169,10 @@ do so with caution!
sudo chmod -R u+rwX tmp/pids/
sudo chmod -R u+rwX tmp/pids/
sudo chmod -R u+rwX tmp/sockets/
sudo chmod -R u+rwX tmp/sockets/
# Create 'uploads' directory otherwise backup will fail
sudo -u git -H mkdir public/uploads
sudo chmod -R u+rwX public/uploads
# Copy the example Puma config
# Copy the example Puma config
sudo -u git -H cp config/puma.rb.example config/puma.rb
sudo -u git -H cp config/puma.rb.example config/puma.rb
...
...
lib/backup/database.rb
View file @
635982a8
...
@@ -45,7 +45,7 @@ module Backup
...
@@ -45,7 +45,7 @@ module Backup
'encoding'
=>
'--default-character-set'
,
'encoding'
=>
'--default-character-set'
,
'password'
=>
'--password'
'password'
=>
'--password'
}
}
args
.
map
{
|
opt
,
arg
|
"
#{
arg
}
=
#{
config
[
opt
]
}
"
if
config
[
opt
]
}.
compact
.
join
(
' '
)
args
.
map
{
|
opt
,
arg
|
"
#{
arg
}
=
'
#{
config
[
opt
]
}
'
"
if
config
[
opt
]
}.
compact
.
join
(
' '
)
end
end
def
pg_env
def
pg_env
...
...
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