From 3390c82b236fb9ce003ee62f275ac30dbf3e5894 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Wed, 6 Jul 2022 16:54:41 +0200 Subject: [PATCH] update config and readme --- .gitignore | 1 + README.md | 6 ++---- docs/INSTALL.md | 33 +++++---------------------------- docs/ffplayout.conf | 14 +++++--------- 4 files changed, 13 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index bb719803..1c65d9fb 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ Videos Videos/ live live/ +*.tar* diff --git a/README.md b/README.md index 7acd9ee2..c3581680 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,13 @@ ffplayout-frontend ===== -This web GUI is for managing [ffplayout_engine](https://github.com/ffplayout/ffplayout_engine) and it depend on [ffplayout-api](https://github.com/ffplayout/ffplayout-api). +This web GUI is for managing [ffplayout](https://github.com/ffplayout/ffplayout). **The Interface is mostly made for 24/7 streaming.** Other scenarios like streaming in folder mode or playlists with no starting time will work, but is not shown correctly. For a better understanding about the functionality, take a look to the screenshots below. - -You can install it on a fresh Debian like system with the [standalone installer](https://github.com/ffplayout/ffplayout-installer). -Or read the instruction [install.md](docs/INSTALL.md) for manual installation. +Read [install.md](docs/INSTALL.md) for manual installation. After installations you have to setup ssl for your **https** connections. diff --git a/docs/INSTALL.md b/docs/INSTALL.md index d6b59cca..31a38fdd 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -1,36 +1,13 @@ -**We need a recent version of npm** - -### OS Specific -On debian 10 you need to install: - -``` -apt install -y curl -``` - -``` -curl -sL https://deb.nodesource.com/setup_14.x | bash - -``` - Installation ----- -- clone repo to **/var/www/ffplayout-frontend** -- cd in repo -- install dependencies: `npm install` -- create **.env** file: - ``` - BASE_URL='http://example.org' - API_URL='/' - ``` - - in dev mode `BASE_URL` should be `http://localhost:3000` and `API_URL=http://localhost:8000` +- download latest **..dist** [release](https://github.com/ffplayout/ffplayout-frontend/releases/latest/) +- unpack and dist content to **/var/www/ffplayout-frontend** - create symlink for the media folder - - when your media folder is a subfolder (for example `/opt/ffplayout/media`) create the same folder structure under **static**: - - `mkdir -p /var/www/ffplayout-frontend/static/opt/ffplayout` - - `ln -s /opt/ffplayout/media /var/www/ffplayout-frontend/static/opt/ffplayout/` -- build app: `npm run build` - -Your frontend should be now in **/var/www/ffplayout-frontend/dist** folder, which is included in the nginx config. + - when your media folder is a subfolder (for example `/opt/ffplayout/media`) create the same folder structure under **/var/www/ffplayout-frontend**: + - `mkdir -p /var/www/ffplayout-frontend/opt/ffplayout` + - `ln -s /opt/ffplayout/media /var/www/ffplayout-frontend/opt/ffplayout/` Copy **docs/ffplayout.conf** to **/etc/nginx/sites-available/** and make a symlink: diff --git a/docs/ffplayout.conf b/docs/ffplayout.conf index 2a9dedc5..551cda67 100644 --- a/docs/ffplayout.conf +++ b/docs/ffplayout.conf @@ -31,11 +31,11 @@ server { return 204; } - root /var/www/ffplayout-frontend/dist/; + root /var/www/ffplayout-frontend/; } - location ~ ^/(api|admin|auth|api-auth) { + location ~ ^/(api|auth) { if ($http_origin ~ '^https?://(localhost|ffplayout\.local)') { add_header 'Access-Control-Allow-Origin' "$http_origin" always; add_header 'Access-Control-Allow-Credentials' 'true' always; @@ -61,18 +61,14 @@ server { proxy_busy_buffers_size 256k; send_timeout 36000s; proxy_no_cache 1; - proxy_pass http://127.0.0.1:8001; + proxy_pass http://127.0.0.1:8000; } - location /static/ { - alias /var/www/ffplayout-api/ffplayout/static/; - } - - location /live/ { + location /live/ { alias /var/www/srs/live/; } - + location /preview/stream.flv { # HTTP-FLV preview proxy_pass http://preview.local:8080/live/stream.flv;