Commit 2e9599b7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 71647fd5 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
......
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment