diff options
| author | nemsia <nemsia@nemsia.org> | 2018-08-31 00:13:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 00:13:03 +0200 |
| commit | 09a07f19c518c1555f7cb09fc0d84be7b55e74f1 (patch) | |
| tree | 217fd016f98ebb3ec6a33806a1c5bbcf82d9e87d /conf | |
| parent | 29399adc3d0049ddefe33a509e263d36881a31fe (diff) | |
| parent | 20fe4996b6fdee3d1ff341ad953f21af0474e109 (diff) | |
| download | mastodon_ynh-09a07f19c518c1555f7cb09fc0d84be7b55e74f1.tar.gz mastodon_ynh-09a07f19c518c1555f7cb09fc0d84be7b55e74f1.tar.bz2 mastodon_ynh-09a07f19c518c1555f7cb09fc0d84be7b55e74f1.zip | |
Merge branch 'develop' into patch-frju365
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mastodon-streaming.service | 2 | ||||
| -rw-r--r-- | conf/mastodon-web.service | 2 | ||||
| -rw-r--r-- | conf/nginx.conf | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/conf/mastodon-streaming.service b/conf/mastodon-streaming.service index 443cac0..689d482 100644 --- a/conf/mastodon-streaming.service +++ b/conf/mastodon-streaming.service @@ -7,7 +7,7 @@ User=__APP__ WorkingDirectory=__FINALPATH__/live Environment="NODE_ENV=production" - Environment="PORT=4000" + Environment="PORT=__PORT_STREAM__" ExecStart=/usr/bin/npm run start TimeoutSec=15 Restart=always diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service index 06069f1..46b304e 100644 --- a/conf/mastodon-web.service +++ b/conf/mastodon-web.service @@ -7,7 +7,7 @@ User=__APP__ WorkingDirectory=__FINALPATH__/live Environment="RAILS_ENV=production" - Environment="PORT=3000" + Environment="PORT=__PORT_WEB__" ExecStart=__FINALPATH__/live/bin/bundle exec puma -C config/puma.rb TimeoutSec=15 Restart=always diff --git a/conf/nginx.conf b/conf/nginx.conf index 562ba8c..87b517a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -31,7 +31,7 @@ location @proxy { 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_pass http://127.0.0.1:__PORT_WEB__; proxy_buffering off; proxy_redirect off; proxy_http_version 1.1; @@ -45,7 +45,7 @@ location /api/v1/streaming { 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_pass http://127.0.0.1:__PORT_STREAM__; proxy_buffering off; proxy_redirect off; proxy_http_version 1.1; |