From b718a1b53b442b01943ae5adb47e89c9f5d1c0b3 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Fri, 2 Mar 2018 13:12:19 +0100 Subject: [PATCH] Remove obsolete settings from master config template --- airtime_mvc/build/airtime.example.conf | 44 -------------------------- install | 3 +- 2 files changed, 1 insertion(+), 46 deletions(-) diff --git a/airtime_mvc/build/airtime.example.conf b/airtime_mvc/build/airtime.example.conf index 9000a8767..4001f8968 100644 --- a/airtime_mvc/build/airtime.example.conf +++ b/airtime_mvc/build/airtime.example.conf @@ -150,50 +150,6 @@ password = # ---------------------------------------------------------------------- -# ---------------------------------------------------------------------- -# M E D I A M O N I T O R -# ---------------------------------------------------------------------- -# -# check_filesystem_events: How long to queue up events performed on the -# files themselves, in seconds -# The default is 5 -# -# check_airtime_events: How long to queue metadata input from airtime, -# in seconds -# The default is 30 -# -# touch_interval: -# The default is 5 -# -# chunking_number: -# The default is 450 -# -# request_max_wait: The maximum request wait time, in seconds -# The default is 3.0 -# -# rmq_event_wait: The RabbitMQ event wait time, in seconds -# The default is 0.1 -# -# logpath: The media monitor log file path -# The default is -# '/var/log/airtime/media-monitor/media-monitor.log' -# -# index_path: The media monitor index path -# The default is -# '/var/tmp/airtime/media-monitor/last_index' -# -[media-monitor] -check_filesystem_events = 5 -check_airtime_events = 30 -touch_interval = 5 -chunking_number = 450 -request_max_wait = 3.0 -rmq_event_wait = 0.1 -logpath = '/var/log/airtime/media-monitor/media-monitor.log' -index_path = '/var/tmp/airtime/media-monitor/last_index' -# -# ---------------------------------------------------------------------- - # ---------------------------------------------------------------------- # P Y P O diff --git a/install b/install index ac7bdcc15..09bc4f015 100755 --- a/install +++ b/install @@ -693,8 +693,7 @@ fi loudCmd "./build.sh" if [ -f /etc/airtime/airtime.conf ]; then # TODO use VERSION or some other way to check for updates and handle - # media-monitor case on it's own and remove the section from the config - # file completely (it's still in the install) + # media-monitor case on it's own OLD_CONF=$(grep "[media-monitor]" /etc/airtime/airtime.conf) if [ -n "${OLD_CONF}" ]; then