Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
92ef845f
Commit
92ef845f
authored
Jul 12, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 6-0-dev
Conflicts: VERSION
parents
51818169
f1fc1ae6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
CHANGELOG
CHANGELOG
+5
-0
lib/support/init.d/gitlab
lib/support/init.d/gitlab
+5
-3
No files found.
CHANGELOG
View file @
92ef845f
...
...
@@ -26,6 +26,11 @@ v 5.4.0
- Misspelling fixes
- Added support of unicorn and fog gems
- Added client list to API doc
- Fix PostgreSQL database restoration problem
- Increase snippet content column size
- allow project import via git:// url
- Show participants on issues, including mentions
- Notify mentioned users with email
v 5.3.0
- Refactored services
...
...
lib/support/init.d/gitlab
View file @
92ef845f
...
...
@@ -20,6 +20,7 @@ APP_USER="git"
DAEMON_OPTS
=
"-C
$APP_ROOT
/config/puma.rb"
PID_PATH
=
"
$APP_ROOT
/tmp/pids"
SOCKET_PATH
=
"
$APP_ROOT
/tmp/sockets"
SOCKET_FILE
=
"
$SOCKET_PATH
/gitlab.socket"
WEB_SERVER_PID
=
"
$PID_PATH
/puma.pid"
SIDEKIQ_PID
=
"
$PID_PATH
/sidekiq.pid"
STOP_SIDEKIQ
=
"RAILS_ENV=production bundle exec rake sidekiq:stop"
...
...
@@ -51,7 +52,7 @@ start() {
exit
1
else
if
[
`
whoami
`
=
root
]
;
then
execute
"rm -f
$SOCKET_PATH
/gitlab.socket
"
!
[
-e
$SOCKET_FILE
]
||
execute
"rm
$SOCKET_FILE
"
execute
"RAILS_ENV=production bundle exec puma
$DAEMON_OPTS
"
execute
"mkdir -p
$PID_PATH
&&
$START_SIDEKIQ
> /dev/null 2>&1 &"
echo
"
$DESC
started"
...
...
@@ -65,12 +66,13 @@ stop() {
if
[
"
$PID
"
-ne
0
-a
"
$STATUS
"
-ne
0
]
;
then
## Program is running, stop it.
kill
-QUIT
`
cat
$WEB_SERVER_PID
`
!
[
-e
$SOCKET_FILE
]
||
execute
"rm
$SOCKET_FILE
"
execute
"mkdir -p
$PID_PATH
&&
$STOP_SIDEKIQ
> /dev/null 2>&1 &"
rm
"
$WEB_SERVER_PID
"
>>
/dev/null
echo
"
$DESC
stopped"
else
## Program is not running, exit with error.
echo
"Error!
$DESC
not started!"
echo
"Error!
$DESC
is
not started!"
exit
1
fi
}
...
...
@@ -81,7 +83,7 @@ restart() {
if
[
"
$PID
"
-ne
0
-a
"
$STATUS
"
-ne
0
]
;
then
echo
"Restarting
$DESC
..."
kill
-USR2
`
cat
$WEB_SERVER_PID
`
execute
"mkdir -p
$PID_PATH
&&
$STOP_SIDEKIQ
> /dev/null 2>&1
&
"
execute
"mkdir -p
$PID_PATH
&&
$STOP_SIDEKIQ
> /dev/null 2>&1"
if
[
`
whoami
`
=
root
]
;
then
execute
"mkdir -p
$PID_PATH
&&
$START_SIDEKIQ
> /dev/null 2>&1 &"
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment