diff options
| author | magikcypress <cyp@rouquin.me> | 2017-04-09 16:32:12 +0200 |
|---|---|---|
| committer | magikcypress <cyp@rouquin.me> | 2017-04-09 16:32:12 +0200 |
| commit | 56c48a47324ffb851fb73654c0fc52049fae5b31 (patch) | |
| tree | 4695862d2c860a4f1513e350afab6b442ddc20b3 /conf | |
| parent | dbd92b090ad9a7ce0b3428623667f308547eca88 (diff) | |
| download | mastodon_ynh-56c48a47324ffb851fb73654c0fc52049fae5b31.tar.gz mastodon_ynh-56c48a47324ffb851fb73654c0fc52049fae5b31.tar.bz2 mastodon_ynh-56c48a47324ffb851fb73654c0fc52049fae5b31.zip | |
Update install
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mastodon-sidekiq.service | 1 | ||||
| -rw-r--r-- | conf/mastodon-streaming.service | 1 | ||||
| -rw-r--r-- | conf/mastodon-web.service | 1 | ||||
| -rw-r--r-- | conf/nginx.conf | 7 |
4 files changed, 5 insertions, 5 deletions
diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service index d31fed4..c0a24c8 100644 --- a/conf/mastodon-sidekiq.service +++ b/conf/mastodon-sidekiq.service @@ -11,6 +11,7 @@ ExecStart=/opt/mastodon/.rbenv/shims/bundle exec sidekiq -c 5 -q default -q mailers -q pull -q push TimeoutSec=15 Restart=always + StandardError=syslog [Install] WantedBy=multi-user.target
\ No newline at end of file diff --git a/conf/mastodon-streaming.service b/conf/mastodon-streaming.service index 1a5be2c..1716b00 100644 --- a/conf/mastodon-streaming.service +++ b/conf/mastodon-streaming.service @@ -11,6 +11,7 @@ ExecStart=/usr/bin/npm run start TimeoutSec=15 Restart=always + StandardError=syslog [Install] WantedBy=multi-user.target
\ No newline at end of file diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service index 9f1d710..4632031 100644 --- a/conf/mastodon-web.service +++ b/conf/mastodon-web.service @@ -11,6 +11,7 @@ ExecStart=/opt/mastodon/.rbenv/shims/bundle exec puma -C config/puma.rb TimeoutSec=15 Restart=always + StandardError=syslog [Install] WantedBy=multi-user.target
\ No newline at end of file diff --git a/conf/nginx.conf b/conf/nginx.conf index 19650dd..a6769a7 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -13,7 +13,7 @@ proxy_redirect off; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; + proxy_set_header Connection "upgrade"; tcp_nodelay on; } @@ -27,9 +27,6 @@ proxy_redirect off; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; + proxy_set_header Connection "upgrade"; tcp_nodelay on; - } - - error_page 500 501 502 503 504 /500.html; }
\ No newline at end of file |