Commit 2e9599b746d5858eea0e4edcd5db4969b74c885c
Exists in
master
and in
4 other branches
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Showing
2 changed files
with
5 additions
and
1 deletions
Show diff stats
doc/install/installation.md
| @@ -169,6 +169,10 @@ do so with caution! | @@ -169,6 +169,10 @@ do so with caution! | ||
| 169 | sudo chmod -R u+rwX tmp/pids/ | 169 | sudo chmod -R u+rwX tmp/pids/ |
| 170 | sudo chmod -R u+rwX tmp/sockets/ | 170 | sudo chmod -R u+rwX tmp/sockets/ |
| 171 | 171 | ||
| 172 | + # Create 'uploads' directory otherwise backup will fail | ||
| 173 | + sudo -u git -H mkdir public/uploads | ||
| 174 | + sudo chmod -R u+rwX public/uploads | ||
| 175 | + | ||
| 172 | # Copy the example Puma config | 176 | # Copy the example Puma config |
| 173 | sudo -u git -H cp config/puma.rb.example config/puma.rb | 177 | sudo -u git -H cp config/puma.rb.example config/puma.rb |
| 174 | 178 |
lib/backup/database.rb
| @@ -45,7 +45,7 @@ module Backup | @@ -45,7 +45,7 @@ module Backup | ||
| 45 | 'encoding' => '--default-character-set', | 45 | 'encoding' => '--default-character-set', |
| 46 | 'password' => '--password' | 46 | 'password' => '--password' |
| 47 | } | 47 | } |
| 48 | - args.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact.join(' ') | 48 | + args.map { |opt, arg| "#{arg}='#{config[opt]}'" if config[opt] }.compact.join(' ') |
| 49 | end | 49 | end |
| 50 | 50 | ||
| 51 | def pg_env | 51 | def pg_env |