diff options
| author | __cyp <cyp@rouquin.me> | 2017-04-10 16:01:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-10 16:01:13 +0200 |
| commit | ea42525c1337719de22303a0e53a8b190b224c79 (patch) | |
| tree | 254e856061f11cf1c8a327d00e46e73d12897190 /conf | |
| parent | b2cd5cc97ad463beac1f12f8ccc02a76c97dc257 (diff) | |
| parent | 4dfe2759421883575d4a63d2879d58b93bc56f6a (diff) | |
| download | mastodon_ynh-ea42525c1337719de22303a0e53a8b190b224c79.tar.gz mastodon_ynh-ea42525c1337719de22303a0e53a8b190b224c79.tar.bz2 mastodon_ynh-ea42525c1337719de22303a0e53a8b190b224c79.zip | |
Merge branch 'master' into master
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mastodon-sidekiq.service | 4 | ||||
| -rw-r--r-- | conf/nginx.conf | 71 |
2 files changed, 37 insertions, 38 deletions
diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service index c0a24c8..34074ed 100644 --- a/conf/mastodon-sidekiq.service +++ b/conf/mastodon-sidekiq.service @@ -7,8 +7,8 @@ User=mastodon WorkingDirectory=/opt/mastodon/live Environment="RAILS_ENV=production" - Environment="DB_POOL=5" - ExecStart=/opt/mastodon/.rbenv/shims/bundle exec sidekiq -c 5 -q default -q mailers -q pull -q push + Environment="DB_POOL=20" + ExecStart=/opt/mastodon/.rbenv/shims/bundle exec sidekiq -c 20 -q default -q mailers -q pull -q push TimeoutSec=15 Restart=always StandardError=syslog diff --git a/conf/nginx.conf b/conf/nginx.conf index d05cdcb..780c462 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,42 +1,41 @@ - location __PATH__ { - alias __FINALPATH__/live/public; +location __PATH__ { + # alias __FINALPATH__/live/public; - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } + try_files $uri @proxy; - try_files $uri @proxy; + #--PRIVATE--# Include SSOWAT user panel. + #--PRIVATE--include conf.d/yunohost_panel.conf.inc; +} - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; - } +location @proxy { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto https; + proxy_pass_header Server; + proxy_pass http://127.0.0.1:3000; + proxy_buffering off; + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + tcp_nodelay on; +} - location @proxy { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; - proxy_pass_header Server; - proxy_pass http://127.0.0.1:3000; - proxy_buffering off; - proxy_redirect off; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - tcp_nodelay on; - } - - location __PATH__/api/v1/streaming { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; - proxy_pass http://127.0.0.1:4000; - proxy_buffering off; - proxy_redirect off; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - tcp_nodelay on; +location /api/v1/streaming { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto https; + proxy_pass http://127.0.0.1:4000; + proxy_buffering off; + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + tcp_nodelay on; }
\ No newline at end of file |