Download as
Browse Code »

Commit 867945d193743ca6abe5064570ae5854a0bf2826

Authored by Dmitriy Zaporozhets
1 parent 70e3bffd
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Improving installation docs

Showing 3 changed files with 6 additions and 27 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @867945d
... ... @@ -96,7 +96,7 @@ omniauth:
96 96 # GitLab Satellites
97 97 satellites:
98 98 # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
99   - path: /home/gitlab/gitlab-satellites/
  99 + path: /home/git/gitlab-satellites/
100 100  
101 101 ## Backup settings
102 102 backup:
... ... @@ -105,8 +105,6 @@ backup:
105 105  
106 106 ## Gitolite settings
107 107 gitolite:
108   - admin_uri: git@localhost:gitolite-admin
109   -
110 108 # REPOS_PATH MUST NOT BE A SYMLINK!!!
111 109 repos_path: /home/git/repositories/
112 110 hooks_path: /home/git/.gitolite/hooks/
... ...
config/unicorn.rb.example
  Diff comments   View file @867945d
... ... @@ -2,7 +2,7 @@
2 2 # note that config/gitlab.yml web path should also be changed
3 3 # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
4 4  
5   -app_dir = "/home/gitlab/gitlab/"
  5 +app_dir = "/home/git/gitlab/"
6 6 worker_processes 2
7 7 working_directory app_dir
8 8  
... ...
doc/install/installation.md
  Diff comments   View file @867945d
... ... @@ -111,12 +111,6 @@ Create a `git` user for Gitlab:
111 111 ./bin/install
112 112  
113 113  
114   -## Add domains to list to the list of known hosts
115   -
116   - sudo -u git -H ssh git@localhost
117   - sudo -u git -H ssh git@YOUR_DOMAIN_NAME
118   - sudo -u git -H ssh git@YOUR_GITOLITE_DOMAIN_NAME
119   -
120 114  
121 115 # 5. Database
122 116  
... ... @@ -137,10 +131,10 @@ See `doc/install/databases.md`
137 131 cd /home/git/gitlab
138 132  
139 133 # Checkout to stable release
140   - sudo -u git -H git checkout 4-1-stable
  134 + sudo -u git -H git checkout 5-0-stable
141 135  
142 136 **Note:**
143   -You can change `4-1-stable` to `master` if you want the *bleeding edge* version, but
  137 +You can change `5-0-stable` to `master` if you want the *bleeding edge* version, but
144 138 do so with caution!
145 139  
146 140 ## Configure it
... ... @@ -155,8 +149,8 @@ do so with caution!
155 149 sudo -u git -H vim config/gitlab.yml
156 150  
157 151 # Make sure GitLab can write to the log/ and tmp/ directories
158   - sudo chown -R gitlab log/
159   - sudo chown -R gitlab tmp/
  152 + sudo chown -R git log/
  153 + sudo chown -R git tmp/
160 154 sudo chmod -R u+rwX log/
161 155 sudo chmod -R u+rwX tmp/
162 156  
... ... @@ -191,19 +185,6 @@ Make sure to update username/password in config/database.yml.
191 185 # Or for PostgreSQL
192 186 sudo -u git -H bundle install --deployment --without development test mysql
193 187  
194   -## Configure Git
195   -
196   -GitLab needs to be able to commit and push changes to Gitolite. In order to do
197   -that Git requires a username and email. (We recommend using the same address
198   -used for the `email.from` setting in `config/gitlab.yml`)
199   -
200   - sudo -u git -H git config --global user.name "GitLab"
201   - sudo -u git -H git config --global user.email "gitlab@localhost"
202   -
203   -## Setup GitLab Hooks
204   -
205   - sudo cp ./lib/hooks/post-receive /home/git/.gitolite/hooks/common/post-receive
206   - sudo chown git:git /home/git/.gitolite/hooks/common/post-receive
207 188  
208 189 ## Initialise Database and Activate Advanced Features
209 190  
... ...