diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-02 04:16:25 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-02 04:16:25 -0700 |
| commit | 777c18b33e5a3ba256b0453ddf4ebcc202bf5cc1 (patch) | |
| tree | 44def0ee5eee3ae9a69d0b97b0c06a5d05fa8afe | |
| parent | 14110af86a5b68227f8714a86e71dd6bdf6b0f62 (diff) | |
| parent | e703ed8fa81384f925626f1e2ddb292a85aa8f35 (diff) | |
| download | gitlab-ci-777c18b33e5a3ba256b0453ddf4ebcc202bf5cc1.tar.gz | |
Merge pull request #244 from antonio/puma_rb_example
Move puma configuration to an example file
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | config/puma.rb.example (renamed from config/puma.rb) | 0 | ||||
| -rw-r--r-- | doc/installation.md | 4 |
3 files changed, 5 insertions, 0 deletions
@@ -1,6 +1,7 @@ ci.db config/application.yml config/database.yml +config/puma.rb log/* tmp/* *.pid diff --git a/config/puma.rb b/config/puma.rb.example index 7a7b96c..7a7b96c 100644 --- a/config/puma.rb +++ b/config/puma.rb.example diff --git a/doc/installation.md b/doc/installation.md index 8d22a62..7ef1f33 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -105,6 +105,10 @@ You can use either MySQL or PostgreSQL. sudo -u gitlab_ci -H cp config/application.yml.example config/application.yml sudo -u gitlab_ci -H vim config/application.yml + # Edit web server settings + sudo -u gitlab_ci -H cp config/puma.rb.example config/puma.rb + sudo -u gitlab_ci -H vim config/puma.rb + # Create socket and pid directories sudo -u gitlab_ci -H mkdir tmp/sockets/ sudo chmod -R u+rwX tmp/sockets/ |