From 7c2ae82c536296da62413e8c46e3dbce63e4e907 Mon Sep 17 00:00:00 2001
From: David Trattnig <david@subsquare.at>
Date: Fri, 24 Nov 2023 14:08:14 +0100
Subject: [PATCH] merge: remove obsolete config
---
config/sample.engine.docker.yaml | 37 +-------------------------------
config/sample.engine.yaml | 36 -------------------------------
2 files changed, 1 insertion(+), 72 deletions(-)
diff --git a/config/sample.engine.docker.yaml b/config/sample.engine.docker.yaml
index 1ab33b0d..a342bf46 100644
--- a/config/sample.engine.docker.yaml
+++ b/config/sample.engine.docker.yaml
@@ -19,30 +19,6 @@ log:
level: ${AURA_ENGINE_LOG_LEVEL}
monitoring:
- mail:
- # Mail server credentials for sending email notifications (Admin and Programme Coordination)
- host: mail.your-radio.org
- port: 587
- user: aura@subsquare.at
- pwd: ---SECRET--PASSWORD---
-
- coordinator:
- # Set to "true" if you want to notify programme-coordinators about about fallback situations, otherwise "false"
- enabled: false
- # If you want to address multiple programme-coordinators separate their emails by space
- mail: programme-coordinator@your-radio.org
-
- admin:
- # Set to "true" if you want to notify admins about incidents, otherwise "false"
- enabled: false
- # If you want to address multiple administrators separate their emails by space
- mail: david@subsquare.at
-
- # The FROM email address used when sending
- from: monitoring@aura.engine
- # A subject prefix allows applying filter rules in your mail client
- subject_prefix: "[AURA Engine]" # default: [AURA Engine]
-
heartbeat:
# Seconds how often the vitality of Engine Core should be checked (default: 1)
frequency: ${AURA_ENGINE_HEARTBEAT_FREQUENCY}
@@ -52,14 +28,12 @@ monitoring:
port: ${AURA_ENGINE_HEARTBEAT_SERVER_PORT}
api:
- ## STEERING ##
steering:
# The URL to get the health status
status: ${AURA_STEERING_BASE_URL}api/v1/
# The URL to get the Calendar via Steering
calendar: ${AURA_STEERING_BASE_URL}api/v1/playout
- ## TANK ##
tank:
# The session name which is used to authenticate against Tank
session: ${AURA_TANK_ENGINE_USER}
@@ -70,7 +44,6 @@ api:
# The URL to get playlist details via Tank
playlist: ${AURA_TANK_BASE_URL}api/v1/playlists/${ID}
- ## ENGINE-API ##
engine:
# Engine ID (1 or 2)
number: 1
@@ -82,16 +55,8 @@ api:
store_clock: ${AURA_ENGINE_API_BASE_URL}api/v1/clock
# Engine API endpoint to store health information
store_health: ${AURA_ENGINE_API_BASE_URL}api/v1/source/health/${ENGINE_NUMBER}
+
scheduler:
- # Database settings: Use 'postgresql', 'sqlite' or 'mysql'. In case of SQLite the "db_name" is the name of the file.
- db:
- type: postgresql
- name: ${AURA_ENGINE_DB_NAME}
- user: ${AURA_ENGINE_DB_USER}
- pwd: ${AURA_ENGINE_DB_PASS}
- host: ${AURA_ENGINE_DB_HOST}
- charset: utf8
-
# Base path as seen by "engine-core", not accessed by "engine"; this is required to construct the absolute audio file path (check "Audio Store" in the docs)
# Either provide an absolute base path or a relative one starting in the `engine` directory. In case of `engine-core` running in docker use `/var/audio/source`
audio:
diff --git a/config/sample.engine.yaml b/config/sample.engine.yaml
index 3a645752..8bffc0a7 100644
--- a/config/sample.engine.yaml
+++ b/config/sample.engine.yaml
@@ -19,30 +19,6 @@ log:
level: info
monitoring:
- mail:
- # Mail server credentials for sending email notifications (Admin and Programme Coordination)
- host: mail.your-radio.org
- port: 587
- user: aura@subsquare.at
- pwd: ---SECRET--PASSWORD---
-
- coordinator:
- # Set to "true" if you want to notify programme-coordinators about about fallback situations, otherwise "false"
- enabled: false
- # If you want to address multiple programme-coordinators separate their emails by space
- mail: programme-coordinator@your-radio.org
-
- admin:
- # Set to "true" if you want to notify admins about incidents, otherwise "false"
- enabled: false
- # If you want to address multiple administrators separate their emails by space
- mail: david@subsquare.at
-
- # The FROM email address used when sending
- from: monitoring@aura.engine
- # A subject prefix allows applying filter rules in your mail client
- subject_prefix: "[AURA Engine]" # default: [AURA Engine]
-
heartbeat:
# Seconds how often the vitality of Engine Core should be checked (default: 1)
frequency: 1
@@ -52,14 +28,12 @@ monitoring:
port: 43334
api:
- ## STEERING ##
steering:
# The URL to get the health status
status: http://localhost:8000/api/v1/
# The URL to get the Calendar via Steering
calendar: http://localhost:8000/api/v1/playout
- ## TANK ##
tank:
# The session name which is used to authenticate against Tank
session: engine
@@ -70,7 +44,6 @@ api:
# The URL to get playlist details via Tank
playlist: http://localhost:8040/api/v1/playlists/${ID}
- ## ENGINE-API ##
engine:
# Engine ID (1 or 2)
number: 1
@@ -84,15 +57,6 @@ api:
store_health: http://localhost:8008/api/v1/source/health/${ENGINE_NUMBER}
scheduler:
- # Database settings: Use 'postgresql', 'sqlite' or 'mysql'. In case of SQLite the "db_name" is the name of the file.
- db:
- type: postgresql
- name: aura_engine
- user: aura_engine
- pwd: "1234"
- host: localhost
- charset: utf8
-
# Base path as seen by "engine-core", not accessed by "engine"; this is required to construct the absolute audio file path (check "Audio Store" in the docs)
# Either provide an absolute base path or a relative one starting in the `engine` directory. In case of `engine-core` running in docker use `/var/audio/source`
audio:
--
GitLab