From 874a86f820466b2c9cd384483d862a3d5e2a3ae7 Mon Sep 17 00:00:00 2001 From: randx Date: Tue, 4 Sep 2012 19:44:17 +0300 Subject: [PATCH] update install to use recipes --- doc/installation.md | 16 ++++++------ lib/support/init-gitlab | 55 ---------------------------------------- lib/support/nginx-gitlab | 33 ------------------------ 3 files changed, 8 insertions(+), 96 deletions(-) delete mode 100644 lib/support/init-gitlab delete mode 100644 lib/support/nginx-gitlab diff --git a/doc/installation.md b/doc/installation.md index 6ba14566..462fbc57 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -48,15 +48,15 @@ Also read the [Read this before you submit an issue](https://github.com/gitlabhq > apt-get install curl sudo > > # 3 steps in 1 command :) -> curl https://raw.github.com/gitlabhq/gitlabhq/master/doc/debian_ubuntu.sh | sh +> curl https://raw.github.com/gitlabhq/gitlab-recipes/master/install/debian_ubuntu.sh | sh > > Now you can go to [Step 4](#4-install-gitlab-and-configuration-check-status-configuration) > > Or if you are installing on Amazon Web Services using Ubuntu 12.04 you can do all steps (1 to 6) at once with: > -> curl https://raw.github.com/gitlabhq/gitlabhq/master/lib/support/aws/debian_ubuntu_aws.sh | sh +> curl https://raw.github.com/gitlabhq/gitlab-recipes/master/install/debian_ubuntu_aws.sh | sh > -> 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) +> for more detailed instructions read the HOWTO section of [the script](https://github.com/gitlabhq/gitlab-recipes/blob/master/install/debian_ubuntu_aws.sh) > - - - # 1. Install packages @@ -77,9 +77,9 @@ Now install the required packages: # 2. Install Ruby - wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz - tar xzfv ruby-1.9.2-p290.tar.gz - cd ruby-1.9.2-p290 + wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz + tar xfvz ruby-1.9.3-p194.tar.gz + cd ruby-1.9.3-p194 ./configure make sudo make install @@ -258,7 +258,7 @@ You can login via web using admin generated with setup: Add GitLab to nginx sites & change with your host specific settings - sudo cp /home/gitlab/gitlab/lib/support/nginx-gitlab /etc/nginx/sites-available/gitlab + sudo wget https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab -P /etc/nginx/sites-available/ sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab # Change **YOUR_SERVER_IP** and **YOUR_SERVER_FQDN** @@ -272,7 +272,7 @@ Restart nginx: Create init script in /etc/init.d/gitlab: - cp /home/gitlab/gitlab/lib/support/init-gitlab /etc/init.d/gitlab + sudo wget https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab -P /etc/init.d/ Adding permission: diff --git a/lib/support/init-gitlab b/lib/support/init-gitlab deleted file mode 100644 index 26ed11e1..00000000 --- a/lib/support/init-gitlab +++ /dev/null @@ -1,55 +0,0 @@ -#! /bin/bash -### BEGIN INIT INFO -# Provides: gitlab -# Required-Start: $local_fs $remote_fs $network $syslog redis-server -# Required-Stop: $local_fs $remote_fs $network $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: GitLab git repository management -# Description: GitLab git repository management -### END INIT INFO - -APP_ROOT="/home/gitlab/gitlab" -DAEMON_OPTS="-c $APP_ROOT/config/unicorn.rb -E production -D" -NAME="unicorn" -DESC="Gitlab service" -PID="$APP_ROOT/tmp/pids/unicorn.pid" -RESQUE_PID="$APP_ROOT/tmp/pids/resque_worker.pid" - -case "$1" in - start) - CD_TO_APP_DIR="cd $APP_ROOT" - START_DAEMON_PROCESS="bundle exec unicorn_rails $DAEMON_OPTS" - START_RESQUE_PROCESS="./resque.sh" - - echo -n "Starting $DESC: " - if [ `whoami` = root ]; then - sudo -u gitlab sh -l -c "$CD_TO_APP_DIR && $START_DAEMON_PROCESS && $START_RESQUE_PROCESS" - else - $CD_TO_APP_DIR && $START_DAEMON_PROCESS && $START_RESQUE_PROCESS - fi - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - kill -QUIT `cat $PID` - kill -QUIT `cat $RESQUE_PID` - echo "$NAME." - ;; - restart) - echo -n "Restarting $DESC: " - kill -USR2 `cat $PID` - echo "$NAME." - ;; - reload) - echo -n "Reloading $DESC configuration: " - kill -HUP `cat $PID` - echo "$NAME." - ;; - *) - echo "Usage: $NAME {start|stop|restart|reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/lib/support/nginx-gitlab b/lib/support/nginx-gitlab deleted file mode 100644 index fa15d201..00000000 --- a/lib/support/nginx-gitlab +++ /dev/null @@ -1,33 +0,0 @@ -upstream gitlab { - server unix:/home/gitlab/gitlab/tmp/sockets/gitlab.socket; -} - -server { - listen YOUR_SERVER_IP:80; # e.g., listen 192.168.1.1:80; - server_name YOUR_SERVER_FQDN; # e.g., server_name source.example.com; - root /home/gitlab/gitlab/public; - - # individual nginx logs for this gitlab vhost - access_log /var/log/nginx/gitlab_access.log; - error_log /var/log/nginx/gitlab_error.log; - - location / { - # serve static files from defined root folder;. - # @gitlab is a named location for the upstream fallback, see below - try_files $uri $uri/index.html $uri.html @gitlab; - } - - # if a file, which is not found in the root folder is requested, - # then the proxy pass the request to the upsteam (gitlab unicorn) - location @gitlab { - proxy_redirect off; - - # you need to change this to "https", if you set "ssl" directive to "on" - proxy_set_header X-FORWARDED_PROTO http; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - - proxy_pass http://gitlab; - } -} -