Skip to content

Commit 32d3414

Browse files
authored
Merge branch 'master' into dev
2 parents 0a5d4cc + f622ac9 commit 32d3414

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ This software is a part of __UnicornTranscoder__ project, it's a binary to repla
1414
## Installation
1515
* Clone this repository
1616
* Run `npm i`
17-
* Set your load-balancer url in `config.js`
17+
* Set your load-balancer url in `config.js` (Note you can also set this as an environment variable called `LB_URL`, otherwise it will default to: `http://127.0.0.1:3001/'`, a slash is required at the end of the url (like the default value).
1818
* Build the binary with `npm start`
1919
* Replace the Plex binary called `Plex Transcoder` by the generated binary store in `bin`, choose the correct version (depending on your OS)
2020

2121
## Disclamer
2222

2323
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2424

25-
__Pull Requests are welcome 😉__
25+
__Pull Requests are welcome 😉__

config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// URL of the load-balancer with last '/'
22
module.exports = {
3-
URL: 'http://127.0.0.1:3001/'
3+
URL: process.env.LB_URL || 'http://127.0.0.1:3001/'
44
};

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "unicorn-ffmpeg",
3-
"version": "2.0.0",
3+
"version": "2.2.1",
44
"description": "Fake FFMPEG binary to extract arguments",
55
"bin": "app.js",
66
"scripts": {

0 commit comments

Comments
 (0)