From 9c37e95309833ae19048ee1e53b8c4070f3e7f8d Mon Sep 17 00:00:00 2001 From: anmol26s Date: Thu, 21 Jun 2018 08:18:02 +0530 Subject: Improved the app --- conf/mastodon-streaming.service | 2 +- conf/mastodon-web.service | 2 +- conf/nginx.conf | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'conf') 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 585109e..a183a31 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -28,7 +28,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; @@ -42,7 +42,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; -- cgit v1.2.3-70-g09d2 From 11bdcf719fe8c0caaf07cc80445e57fa4f90dcb8 Mon Sep 17 00:00:00 2001 From: anmol26s <5068843+anmol26s@users.noreply.github.com> Date: Wed, 11 Jul 2018 20:57:38 +0530 Subject: Sources updated to 2.4.3 --- conf/app-mastodon.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/app-mastodon.src b/conf/app-mastodon.src index fa0e2eb..9ef161a 100644 --- a/conf/app-mastodon.src +++ b/conf/app-mastodon.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.4.2.tar.gz -SOURCE_SUM=2de73e57e4f3da4b046b8b1d8c90a03d1bdd8f9abddca8f5329d02a34ed821a5 +SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.4.3.tar.gz +SOURCE_SUM=efdc680632386665d7b0ba988acd18113557ad165bcc158bfc2c273da76616ce SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -- cgit v1.2.3-70-g09d2