Commit d041f86c authored by David Trattnig's avatar David Trattnig
Browse files

Merge branch 'develop'

parents 620c3740 fde5fdf9
[submodule "contrib/engine-core"]
path = contrib/engine-core
url = git@gitlab.servus.at:aura/engine-core.git
[submodule "contrib/engine-api"]
path = contrib/engine-api
url = git@gitlab.servus.at:aura/engine-api.git
[submodule "contrib/engine-clock"]
path = contrib/engine-clock
url = git@gitlab.servus.at:aura/engine-clock.git
\ No newline at end of file
Gottfried Gaisbauer <gogo@servus.at> Gottfried <gogo@servus.at>
Ingo Leindecker <ingo.leindecker@fro.at> ingo <ingo.leindecker@fro.at>
David Trattnig <david.trattnig@gmail.com> <david@subsquare.at>
David Trattnig <david.trattnig@gmail.com> <david.trattnig@o94.at>
David Trattnig <david.trattnig@gmail.com> david
Christian Pointner <equinox@helsinki.at> Christian Pointner <equinox@spreadspace.org>
Ernesto Rico Schmidt <ernesto@helsinki.at> Ernesto Rico Schmidt <e.rico.schmidt@gmail.com>
Ernesto Rico Schmidt <ernesto@helsinki.at> nnrcschmdt <e.rico.schmidt@gmail.com>
Hermann Schwärzler <hermann.schwaerzler@freirad.at> Hermann <hermann@laptop>
jackie / Andrea Ida Malkah Klaura <jackie@diebin.at> <jackie@o94.at>
jackie / Andrea Ida Malkah Klaura <jackie@diebin.at> Andrea Ida Malkah Klaura
\ No newline at end of file
...@@ -9,17 +9,17 @@ the requirements of community radio stations. ...@@ -9,17 +9,17 @@ the requirements of community radio stations.
<!-- TOC --> <!-- TOC -->
- [Aura Engine](#aura-engine) 1. [Aura Engine](#aura-engine)
- [Functionality](#functionality) 1. [Functionality](#functionality)
- [Scheduler](#scheduler) 1. [Scheduler](#scheduler)
- [Versatile playlists](#versatile-playlists) 1. [Versatile playlists](#versatile-playlists)
- [Default playlists](#default-playlists) 2. [Default playlists](#default-playlists)
- [Heartbeat Monitoring](#heartbeat-monitoring) 2. [Heartbeat Monitoring](#heartbeat-monitoring)
- [Logging](#logging) 3. [Logging](#logging)
- [Getting started](#getting-started) 2. [Getting started](#getting-started)
- [Using Docker](#using-docker) 3. [Using Docker](#using-docker)
- [Read more](#read-more) 4. [Read more](#read-more)
- [About](#about) 5. [About](#about)
<!-- /TOC --> <!-- /TOC -->
...@@ -33,7 +33,7 @@ In conjuction with other AURA components Engine provides several features: ...@@ -33,7 +33,7 @@ In conjuction with other AURA components Engine provides several features:
- **Autonomous playout** by caching the schedule information pulled from [Steering](https://gitlab.servus.at/aura/steering) in a local database. This allows Engine be keep running, independently from any network or service outages. This enables the application of (*High Availability* infrastructure scenarios)[https://gitlab.servus.at/aura/meta/-/blob/master/docs/administration/installation-guide.md#high-availability]. - **Autonomous playout** by caching the schedule information pulled from [Steering](https://gitlab.servus.at/aura/steering) in a local database. This allows Engine be keep running, independently from any network or service outages. This enables the application of (*High Availability* infrastructure scenarios)[https://gitlab.servus.at/aura/meta/-/blob/master/docs/administration/installation-guide.md#high-availability].
- **Auto DJ with Silcence Detector** provided by [Engine Core](https://gitlab.servus.at/aura/engine-core) - **Auto DJ with Silcence Detector** provided by [Engine Core](https://gitlab.servus.at/aura/engine-core)
- **Web Application for a Track Service** (see [AURA Player](https://gitlab.servus.at/aura/player)) - **Web Application for a Track Service** (see [AURA Player](https://gitlab.servus.at/aura/player))
- **Web Application providing a Studio Clock** (see [Engine Clock](https://gitlab.servus.at/aura/engine-clock)) - **Web Application providing a Studio Clock** (see [Dashboard Clock](https://gitlab.servus.at/aura/dashboard-clock))
- **Bulk and Timeslot Recorder** (*Not yet available*, this will be provided after v1.1 by a planned `engine-recorder` component) - **Bulk and Timeslot Recorder** (*Not yet available*, this will be provided after v1.1 by a planned `engine-recorder` component)
- **API** to query Track-Service, monthly reports and information for displaying the Studio Clock (see [Engine API](https://gitlab.servus.at/aura/engine-api)) - **API** to query Track-Service, monthly reports and information for displaying the Studio Clock (see [Engine API](https://gitlab.servus.at/aura/engine-api))
...@@ -116,5 +116,5 @@ AURA stands for Automated Radio and is a swiss army knife for community radio st ...@@ -116,5 +116,5 @@ AURA stands for Automated Radio and is a swiss army knife for community radio st
| [<img src="https://gitlab.servus.at/aura/meta/-/raw/master/assets/images/aura-steering.png" width="150" align="left" />](https://gitlab.servus.at/aura/steering) | [<img src="https://gitlab.servus.at/aura/meta/-/raw/master/assets/images/aura-dashboard.png" width="150" align="left" />](https://gitlab.servus.at/aura/dashboard) | [<img src="https://gitlab.servus.at/aura/meta/-/raw/master/assets/images/aura-tank.png" width="150" align="left" />](https://gitlab.servus.at/aura/tank) | [<img src="https://gitlab.servus.at/aura/meta/-/raw/master/assets/images/aura-engine.png" width="150" align="left" />](https://gitlab.servus.at/aura/engine) | | [<img src="https://gitlab.servus.at/aura/meta/-/raw/master/assets/images/aura-steering.png" width="150" align="left" />](https://gitlab.servus.at/aura/steering) | [<img src="https://gitlab.servus.at/aura/meta/-/raw/master/assets/images/aura-dashboard.png" width="150" align="left" />](https://gitlab.servus.at/aura/dashboard) | [<img src="https://gitlab.servus.at/aura/meta/-/raw/master/assets/images/aura-tank.png" width="150" align="left" />](https://gitlab.servus.at/aura/tank) | [<img src="https://gitlab.servus.at/aura/meta/-/raw/master/assets/images/aura-engine.png" width="150" align="left" />](https://gitlab.servus.at/aura/engine) |
|---|---|---|---| |---|---|---|---|
| [Steering](https://gitlab.servus.at/aura/steering) | [Dashboard](https://gitlab.servus.at/aura/dashboard) | [Tank](https://gitlab.servus.at/aura/tank) | [Engine](https://gitlab.servus.at/aura/engine)<br/>[Engine Core](https://gitlab.servus.at/aura/engine-core)<br/>[Engine API](https://gitlab.servus.at/aura/engine-api)<br/>[Engine Clock](https://gitlab.servus.at/aura/engine-clock) | | [Steering](https://gitlab.servus.at/aura/steering) | [Dashboard](https://gitlab.servus.at/aura/dashboard)<br/>[Dashboard Clock](https://gitlab.servus.at/aura/dashboard-clock) | [Tank](https://gitlab.servus.at/aura/tank) | [Engine](https://gitlab.servus.at/aura/engine)<br/>[Engine Core](https://gitlab.servus.at/aura/engine-core)<br/>[Engine API](https://gitlab.servus.at/aura/engine-api) |
...@@ -55,7 +55,7 @@ Ensure you have following other projects up and running: ...@@ -55,7 +55,7 @@ Ensure you have following other projects up and running:
- tank - tank
- dashboard - dashboard
- engine-api - engine-api
- engine-clock (optional) - dashboard-clock (optional)
The following steps espect you having done the bases configuration and set up a database as outlined in the [Native Installation](https://gitlab.servus.at/aura/engine/-/blob/master/docs/bare-metal-installation.md) document. The following steps espect you having done the bases configuration and set up a database as outlined in the [Native Installation](https://gitlab.servus.at/aura/engine/-/blob/master/docs/bare-metal-installation.md) document.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment