Simplify setup for nginx, initd with already predefined files
This commit is contained in:
Dmitriy Zaporozhets
parent
4fe438ce63
commit
aa708ed961
3 changed files with 94 additions and 88 deletions
|
|
@ -244,42 +244,14 @@ You can login via web using admin generated with setup:
|
||||||
sudo -u gitlab cp config/unicorn.rb.orig config/unicorn.rb
|
sudo -u gitlab cp config/unicorn.rb.orig config/unicorn.rb
|
||||||
sudo -u gitlab bundle exec unicorn_rails -c config/unicorn.rb -E production -D
|
sudo -u gitlab bundle exec unicorn_rails -c config/unicorn.rb -E production -D
|
||||||
|
|
||||||
Edit /etc/nginx/nginx.conf. In the *http* section add:
|
Add gitlab to nginx sites & change with your host specific settings
|
||||||
|
|
||||||
upstream gitlab {
|
cp /home/gitlab/gitlab/lib/support/nginx-gitlab /etc/nginx/sites-enabled/gitlab
|
||||||
server unix:/home/gitlab/gitlab/tmp/sockets/gitlab.socket;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
# Change **YOUR_SERVER_IP** and **YOUR_SERVER_FQDN**
|
||||||
listen YOUR_SERVER_IP:80; # e.g., listen 192.168.1.1:80;
|
# to the IP address and fully-qualified domain name
|
||||||
server_name YOUR_SERVER_FQDN; # e.g., server_name source.example.com;
|
# of the host serving GitLab.
|
||||||
root /home/gitlab/gitlab/public;
|
vim /etc/nginx/sites-enabled/nginx-gitlab
|
||||||
|
|
||||||
# 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Change **YOUR_SERVER_IP** and **YOUR_SERVER_FQDN** to the IP address and fully-qualified domain name of the host serving GitLab.
|
|
||||||
|
|
||||||
Restart nginx:
|
Restart nginx:
|
||||||
|
|
||||||
|
|
@ -287,60 +259,7 @@ Restart nginx:
|
||||||
|
|
||||||
Create init script in /etc/init.d/gitlab:
|
Create init script in /etc/init.d/gitlab:
|
||||||
|
|
||||||
#! /bin/bash
|
cp /home/gitlab/gitlab/lib/support/init-gitlab /etc/init.d/gitlab
|
||||||
### 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
|
|
||||||
|
|
||||||
DAEMON_OPTS="-c /home/gitlab/gitlab/config/unicorn.rb -E production -D"
|
|
||||||
NAME=unicorn
|
|
||||||
DESC="Gitlab service"
|
|
||||||
PID=/home/gitlab/gitlab/tmp/pids/unicorn.pid
|
|
||||||
RESQUE_PID=/home/gitlab/gitlab/tmp/pids/resque_worker.pid
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
CD_TO_APP_DIR="cd /home/gitlab/gitlab"
|
|
||||||
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 > /dev/null 2>&1 && $START_DAEMON_PROCESS && $START_RESQUE_PROCESS"
|
|
||||||
else
|
|
||||||
$CD_TO_APP_DIR > /dev/null 2>&1 && $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
|
|
||||||
|
|
||||||
Adding permission:
|
Adding permission:
|
||||||
|
|
||||||
|
|
|
||||||
54
lib/support/init-gitlab
Normal file
54
lib/support/init-gitlab
Normal file
|
|
@ -0,0 +1,54 @@
|
||||||
|
#! /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
|
||||||
|
|
||||||
|
DAEMON_OPTS="-c /home/gitlab/gitlab/config/unicorn.rb -E production -D"
|
||||||
|
NAME=unicorn
|
||||||
|
DESC="Gitlab service"
|
||||||
|
PID=/home/gitlab/gitlab/tmp/pids/unicorn.pid
|
||||||
|
RESQUE_PID=/home/gitlab/gitlab/tmp/pids/resque_worker.pid
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
CD_TO_APP_DIR="cd /home/gitlab/gitlab"
|
||||||
|
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 > /dev/null 2>&1 && $START_DAEMON_PROCESS && $START_RESQUE_PROCESS"
|
||||||
|
else
|
||||||
|
$CD_TO_APP_DIR > /dev/null 2>&1 && $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
|
||||||
33
lib/support/nginx-gitlab
Normal file
33
lib/support/nginx-gitlab
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Loading…
Add table
Reference in a new issue