Download as
Browse Code »

Commit 874a86f820466b2c9cd384483d862a3d5e2a3ae7

Authored by randx
1 parent d6ea70c9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

update install to use recipes

Showing 3 changed files with 8 additions and 96 deletions   Show diff stats
doc/installation.md
  Diff comments   View file @874a86f
... ... @@ -48,15 +48,15 @@ Also read the [Read this before you submit an issue](https://github.com/gitlabhq
48 48 > apt-get install curl sudo
49 49 >
50 50 > # 3 steps in 1 command :)
51   -> curl https://raw.github.com/gitlabhq/gitlabhq/master/doc/debian_ubuntu.sh | sh
  51 +> curl https://raw.github.com/gitlabhq/gitlab-recipes/master/install/debian_ubuntu.sh | sh
52 52 >
53 53 > Now you can go to [Step 4](#4-install-gitlab-and-configuration-check-status-configuration)
54 54 >
55 55 > Or if you are installing on Amazon Web Services using Ubuntu 12.04 you can do all steps (1 to 6) at once with:
56 56 >
57   -> curl https://raw.github.com/gitlabhq/gitlabhq/master/lib/support/aws/debian_ubuntu_aws.sh | sh
  57 +> curl https://raw.github.com/gitlabhq/gitlab-recipes/master/install/debian_ubuntu_aws.sh | sh
58 58 >
59   -> for more detailed instructions read the HOWTO section of [the script](https://github.com/gitlabhq/gitlabhq/blob/master/lib/support/aws/debian_ubuntu_aws.sh)
  59 +> for more detailed instructions read the HOWTO section of [the script](https://github.com/gitlabhq/gitlab-recipes/blob/master/install/debian_ubuntu_aws.sh)
60 60 > - - -
61 61  
62 62 # 1. Install packages
... ... @@ -77,9 +77,9 @@ Now install the required packages:
77 77  
78 78 # 2. Install Ruby
79 79  
80   - wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz
81   - tar xzfv ruby-1.9.2-p290.tar.gz
82   - cd ruby-1.9.2-p290
  80 + wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz
  81 + tar xfvz ruby-1.9.3-p194.tar.gz
  82 + cd ruby-1.9.3-p194
83 83 ./configure
84 84 make
85 85 sudo make install
... ... @@ -258,7 +258,7 @@ You can login via web using admin generated with setup:
258 258  
259 259 Add GitLab to nginx sites & change with your host specific settings
260 260  
261   - sudo cp /home/gitlab/gitlab/lib/support/nginx-gitlab /etc/nginx/sites-available/gitlab
  261 + sudo wget https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab -P /etc/nginx/sites-available/
262 262 sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab
263 263  
264 264 # Change **YOUR_SERVER_IP** and **YOUR_SERVER_FQDN**
... ... @@ -272,7 +272,7 @@ Restart nginx:
272 272  
273 273 Create init script in /etc/init.d/gitlab:
274 274  
275   - cp /home/gitlab/gitlab/lib/support/init-gitlab /etc/init.d/gitlab
  275 + sudo wget https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab -P /etc/init.d/
276 276  
277 277 Adding permission:
278 278  
... ...
lib/support/init-gitlab
View file @d6ea70c
... ... @@ -1,55 +0,0 @@
1   -#! /bin/bash
2   -### BEGIN INIT INFO
3   -# Provides: gitlab
4   -# Required-Start: $local_fs $remote_fs $network $syslog redis-server
5   -# Required-Stop: $local_fs $remote_fs $network $syslog
6   -# Default-Start: 2 3 4 5
7   -# Default-Stop: 0 1 6
8   -# Short-Description: GitLab git repository management
9   -# Description: GitLab git repository management
10   -### END INIT INFO
11   -
12   -APP_ROOT="/home/gitlab/gitlab"
13   -DAEMON_OPTS="-c $APP_ROOT/config/unicorn.rb -E production -D"
14   -NAME="unicorn"
15   -DESC="Gitlab service"
16   -PID="$APP_ROOT/tmp/pids/unicorn.pid"
17   -RESQUE_PID="$APP_ROOT/tmp/pids/resque_worker.pid"
18   -
19   -case "$1" in
20   - start)
21   - CD_TO_APP_DIR="cd $APP_ROOT"
22   - START_DAEMON_PROCESS="bundle exec unicorn_rails $DAEMON_OPTS"
23   - START_RESQUE_PROCESS="./resque.sh"
24   -
25   - echo -n "Starting $DESC: "
26   - if [ `whoami` = root ]; then
27   - sudo -u gitlab sh -l -c "$CD_TO_APP_DIR && $START_DAEMON_PROCESS && $START_RESQUE_PROCESS"
28   - else
29   - $CD_TO_APP_DIR && $START_DAEMON_PROCESS && $START_RESQUE_PROCESS
30   - fi
31   - echo "$NAME."
32   - ;;
33   - stop)
34   - echo -n "Stopping $DESC: "
35   - kill -QUIT `cat $PID`
36   - kill -QUIT `cat $RESQUE_PID`
37   - echo "$NAME."
38   - ;;
39   - restart)
40   - echo -n "Restarting $DESC: "
41   - kill -USR2 `cat $PID`
42   - echo "$NAME."
43   - ;;
44   - reload)
45   - echo -n "Reloading $DESC configuration: "
46   - kill -HUP `cat $PID`
47   - echo "$NAME."
48   - ;;
49   - *)
50   - echo "Usage: $NAME {start|stop|restart|reload}" >&2
51   - exit 1
52   - ;;
53   -esac
54   -
55   -exit 0
lib/support/nginx-gitlab
View file @d6ea70c
... ... @@ -1,33 +0,0 @@
1   -upstream gitlab {
2   - server unix:/home/gitlab/gitlab/tmp/sockets/gitlab.socket;
3   -}
4   -
5   -server {
6   - listen YOUR_SERVER_IP:80; # e.g., listen 192.168.1.1:80;
7   - server_name YOUR_SERVER_FQDN; # e.g., server_name source.example.com;
8   - root /home/gitlab/gitlab/public;
9   -
10   - # individual nginx logs for this gitlab vhost
11   - access_log /var/log/nginx/gitlab_access.log;
12   - error_log /var/log/nginx/gitlab_error.log;
13   -
14   - location / {
15   - # serve static files from defined root folder;.
16   - # @gitlab is a named location for the upstream fallback, see below
17   - try_files $uri $uri/index.html $uri.html @gitlab;
18   - }
19   -
20   - # if a file, which is not found in the root folder is requested,
21   - # then the proxy pass the request to the upsteam (gitlab unicorn)
22   - location @gitlab {
23   - proxy_redirect off;
24   -
25   - # you need to change this to "https", if you set "ssl" directive to "on"
26   - proxy_set_header X-FORWARDED_PROTO http;
27   - proxy_set_header Host $http_host;
28   - proxy_set_header X-Real-IP $remote_addr;
29   -
30   - proxy_pass http://gitlab;
31   - }
32   -}
33   -