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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
85e784cc
Commit
85e784cc
authored
May 09, 2013
by
Lyle Entwistle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed puma.rb environment setting, no need to specify 'production' in daemon options now
parent
6e1ee1fe
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
config/puma.rb.example
config/puma.rb.example
+2
-2
lib/support/init.d/gitlab
lib/support/init.d/gitlab
+1
-1
No files found.
config/puma.rb.example
View file @
85e784cc
#!/usr/bin/env puma
#!/usr/bin/env puma
# Start Puma with next command:
# Start Puma with next command:
# RAILS_ENV=production bundle exec puma -
e production -
C ./config/puma.rb
# RAILS_ENV=production bundle exec puma -C ./config/puma.rb
# uncomment and customize to run in non-root path
# uncomment and customize to run in non-root path
# note that config/gitlab.yml web path should also be changed
# note that config/gitlab.yml web path should also be changed
...
@@ -19,7 +19,7 @@ directory application_path
...
@@ -19,7 +19,7 @@ directory application_path
#
#
# The default is “development”.
# The default is “development”.
#
#
environment
= :production
environment
'production'
# Daemonize the server into the background. Highly suggest that
# Daemonize the server into the background. Highly suggest that
# this be combined with “pidfile” and “stdout_redirect”.
# this be combined with “pidfile” and “stdout_redirect”.
...
...
lib/support/init.d/gitlab
View file @
85e784cc
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
APP_ROOT
=
"/home/git/gitlab"
APP_ROOT
=
"/home/git/gitlab"
APP_USER
=
"git"
APP_USER
=
"git"
DAEMON_OPTS
=
"-C
$APP_ROOT
/config/puma.rb
-e production
"
DAEMON_OPTS
=
"-C
$APP_ROOT
/config/puma.rb"
PID_PATH
=
"
$APP_ROOT
/tmp/pids"
PID_PATH
=
"
$APP_ROOT
/tmp/pids"
WEB_SERVER_PID
=
"
$PID_PATH
/puma.pid"
WEB_SERVER_PID
=
"
$PID_PATH
/puma.pid"
SIDEKIQ_PID
=
"
$PID_PATH
/sidekiq.pid"
SIDEKIQ_PID
=
"
$PID_PATH
/sidekiq.pid"
...
...
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