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

Dmitriy Zaporozhets
2 parents 71647fd5 635982a8
Showing 2 changed files with 5 additions and 1 deletions Show diff stats
doc/install/installation.md
lib/backup/database.rb
@@ -169,6 +169,10 @@ do so with caution!
     sudo chmod -R u+rwX  tmp/pids/
     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
     sudo -u git -H cp config/puma.rb.example config/puma.rb
  
@@ -45,7 +45,7 @@ module Backup
         'encoding'  => '--default-character-set',
         '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
  
     def pg_env
...	...	@@ -169,6 +169,10 @@ do so with caution!
169	169	sudo chmod -R u+rwX tmp/pids/
170	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	176	# Copy the example Puma config
173	177	sudo -u git -H cp config/puma.rb.example config/puma.rb
174	178
...	...
...	...	@@ -45,7 +45,7 @@ module Backup
45	45	'encoding' => '--default-character-set',
46	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	49	end
50	50
51	51	def pg_env
...	...