Merge pull request #6658 from tsigo/rs-important-dirs

Make sure important directories exist in git

Merge pull request #6658 from tsigo/rs-important-dirs
Make sure important directories exist in git
Dmitriy Zaporozhets
2 parents 14b68586 34c5e6de
Showing 4 changed files with 6 additions and 9 deletions Show diff stats
doc/install/installation.md
public/uploads/.gitkeep
tmp/pids/.gitkeep
tmp/sockets/.gitkeep
@@ -197,21 +197,18 @@ You can change `6-6-stable` to `master` if you want the *bleeding edge* version,
     # Make sure GitLab can write to the log/ and tmp/ directories
     sudo chown -R git log/
     sudo chown -R git tmp/
-    sudo chmod -R u+rwX  log/
-    sudo chmod -R u+rwX  tmp/
+    sudo chmod -R u+rwX log/
+    sudo chmod -R u+rwX tmp/
  
     # Create directory for satellites
     sudo -u git -H mkdir /home/git/gitlab-satellites
     sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
  
-    # Create directories for sockets/pids and make sure GitLab can write to them
-    sudo -u git -H mkdir tmp/pids/
-    sudo -u git -H mkdir tmp/sockets/
-    sudo chmod -R u+rwX  tmp/pids/
-    sudo chmod -R u+rwX  tmp/sockets/
+    # Make sure GitLab can write to the tmp/pids/ and tmp/sockets/ directories
+    sudo chmod -R u+rwX tmp/pids/
+    sudo chmod -R u+rwX tmp/sockets/
  
-    # Create public/uploads directory otherwise backup will fail
-    sudo -u git -H mkdir public/uploads
+    # Make sure GitLab can write to the public/uploads/ directory
     sudo chmod -R u+rwX  public/uploads
  
     # Copy the example Unicorn config
...	...	@@ -197,21 +197,18 @@ You can change `6-6-stable` to `master` if you want the bleeding edge version,
197	197	# Make sure GitLab can write to the log/ and tmp/ directories
198	198	sudo chown -R git log/
199	199	sudo chown -R git tmp/
200		- sudo chmod -R u+rwX log/
201		- sudo chmod -R u+rwX tmp/
	200	+ sudo chmod -R u+rwX log/
	201	+ sudo chmod -R u+rwX tmp/
202	202
203	203	# Create directory for satellites
204	204	sudo -u git -H mkdir /home/git/gitlab-satellites
205	205	sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
206	206
207		- # Create directories for sockets/pids and make sure GitLab can write to them
208		- sudo -u git -H mkdir tmp/pids/
209		- sudo -u git -H mkdir tmp/sockets/
210		- sudo chmod -R u+rwX tmp/pids/
211		- sudo chmod -R u+rwX tmp/sockets/
	207	+ # Make sure GitLab can write to the tmp/pids/ and tmp/sockets/ directories
	208	+ sudo chmod -R u+rwX tmp/pids/
	209	+ sudo chmod -R u+rwX tmp/sockets/
212	210
213		- # Create public/uploads directory otherwise backup will fail
214		- sudo -u git -H mkdir public/uploads
	211	+ # Make sure GitLab can write to the public/uploads/ directory
215	212	sudo chmod -R u+rwX public/uploads
216	213
217	214	# Copy the example Unicorn config
...	...