Skip to content

Commit

Permalink
Changed ports (#76)
Browse files Browse the repository at this point in the history
  • Loading branch information
spietras authored Oct 20, 2024
1 parent 135556f commit 6537874
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 15 deletions.
8 changes: 4 additions & 4 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ services:
context: ./
network: host
environment:
- "DINGO__SERVER__SRT__PORT=${DINGO__SERVER__SRT__PORT:-9000}"
- "DINGO__SERVER__HTTP__PORT=${DINGO__SERVER__HTTP__PORT:-9001}"
- "DINGO__SERVER__SRT__PORT=${DINGO__SERVER__SRT__PORT:-10100}"
- "DINGO__SERVER__HTTP__PORT=${DINGO__SERVER__HTTP__PORT:-10101}"
- "DINGO__STATE__STORE__PATH=${DINGO__STATE__STORE__PATH:-data/state.json}"
- "DINGO__STATE__CACHE__TTL=${DINGO__STATE__CACHE__TTL:-60}"
- "DINGO__PELICAN__HTTP__SCHEME=${DINGO__PELICAN__HTTP__SCHEME:-http}"
- "DINGO__PELICAN__HTTP__HOST=${DINGO__PELICAN__HTTP__HOST:-localhost}"
- "DINGO__PELICAN__HTTP__PORT=${DINGO__PELICAN__HTTP__PORT:-42000}"
- "DINGO__PELICAN__HTTP__PORT=${DINGO__PELICAN__HTTP__PORT:-10200}"
- "DINGO__PELICAN__HTTP__PATH=${DINGO__PELICAN__HTTP__PATH:-}"
- "DINGO__QUOKKA__ICY__HOST=${DINGO__QUOKKA__ICY__HOST:-localhost}"
- "DINGO__QUOKKA__ICY__PORT=${DINGO__QUOKKA__ICY__PORT:-8000}"
- "DINGO__QUOKKA__ICY__PORT=${DINGO__QUOKKA__ICY__PORT:-10000}"
- "DINGO__QUOKKA__ICY__USER=${DINGO__QUOKKA__ICY__USER:-source}"
- "DINGO__QUOKKA__ICY__PASSWORD=${DINGO__QUOKKA__ICY__PASSWORD:-password}"
- "DINGO__QUOKKA__ICY__MOUNT=${DINGO__QUOKKA__ICY__MOUNT:-radio.mp3}"
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/02-Usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ For example, you can use [`Liquidsoap`](https://www.liquidsoap.info) for that:
liquidsoap \
'output.srt(
host="127.0.0.1",
port=9000,
port=10100,
%ogg(%opus),
sine()
)'
Expand All @@ -36,7 +36,7 @@ ffmpeg \
-i sine \
-c libopus \
-f ogg \
srt://127.0.0.1:9000
srt://127.0.0.1:10100
```

## Managing playlists
Expand All @@ -56,5 +56,5 @@ curl \
--request PUT \
--header "Content-Type: application/json" \
--data '{"id": "123e4567-e89b-12d3-a456-426614174000"}' \
http://localhost:9001/playlist
http://localhost:10101/playlist
```
8 changes: 4 additions & 4 deletions docs/docs/03-Configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ You can configure the service at runtime using various environment variables:

- `DINGO__SERVER__SRT__PORT`
port to listen for SRT connections
(default: `9000`)
(default: `10100`)
- `DINGO__SERVER__HTTP__PORT` -
port to listen for HTTP connections
(default: `9001`)
(default: `10101`)
- `DINGO__STATE__STORE__PATH` -
path to the file to store the state
(default: `data/state.json`)
Expand All @@ -27,7 +27,7 @@ You can configure the service at runtime using various environment variables:
(default: `localhost`)
- `DINGO__PELICAN__HTTP__PORT` -
port of the HTTP API of the pelican service
(default: `42000`)
(default: `10200`)
- `DINGO__PELICAN__HTTP__PATH` -
path of the HTTP API of the pelican service
(default: ``)
Expand All @@ -36,7 +36,7 @@ You can configure the service at runtime using various environment variables:
(default: `localhost`)
- `DINGO__QUOKKA__ICY__PORT` -
port of the ICY API of the quokka service
(default: `8000`)
(default: `10000`)
- `DINGO__QUOKKA__ICY__USER` -
user to authenticate with the ICY API of the quokka service
(default: `source`)
Expand Down
2 changes: 1 addition & 1 deletion src/config/pelican/http.liq
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let config.pelican.http.host =
utils.env.safeget(default="localhost", "DINGO__PELICAN__HTTP__HOST")
let config.pelican.http.port =
utils.parse.oint(
utils.env.safeget(default="42000", "DINGO__PELICAN__HTTP__PORT")
utils.env.safeget(default="10200", "DINGO__PELICAN__HTTP__PORT")
)
let config.pelican.http.path = utils.env.get("DINGO__PELICAN__HTTP__PATH")
let config.pelican.http.url =
Expand Down
4 changes: 3 additions & 1 deletion src/config/quokka/icy.liq
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ let config.quokka.icy = {}
let config.quokka.icy.host =
utils.env.safeget(default="localhost", "DINGO__QUOKKA__ICY__HOST")
let config.quokka.icy.port =
utils.parse.int(utils.env.safeget(default="8000", "DINGO__QUOKKA__ICY__PORT"))
utils.parse.int(
utils.env.safeget(default="10000", "DINGO__QUOKKA__ICY__PORT")
)
let config.quokka.icy.user =
utils.env.safeget(default="source", "DINGO__QUOKKA__ICY__USER")
let config.quokka.icy.password =
Expand Down
2 changes: 1 addition & 1 deletion src/config/server/http.liq
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ let config.server.http = {}

let config.server.http.port =
utils.parse.int(
utils.env.safeget(default="9001", "DINGO__SERVER__HTTP__PORT")
utils.env.safeget(default="10101", "DINGO__SERVER__HTTP__PORT")
)
4 changes: 3 additions & 1 deletion src/config/server/srt.liq
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
let config.server.srt = {}

let config.server.srt.port =
utils.parse.int(utils.env.safeget(default="9000", "DINGO__SERVER__SRT__PORT"))
utils.parse.int(
utils.env.safeget(default="10100", "DINGO__SERVER__SRT__PORT")
)

0 comments on commit 6537874

Please sign in to comment.