diff --git a/application/configs/conf.php b/application/configs/conf.php index 4888173cd..67c826da1 100644 --- a/application/configs/conf.php +++ b/application/configs/conf.php @@ -83,15 +83,4 @@ set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath'] function load_airtime_config(){ $ini_array = parse_ini_file('/etc/airtime/airtime.conf', true); return $ini_array; - /* - return array( - 'database' => array( - 'username' => $ini_array['database']['dbuser'], - 'password' => $ini_array['database']['dbpass'], - 'hostspec' => $ini_array['database']['host'], - 'phptype' => 'pgsql', - 'database' => $ini_array['database']['dbname']), - 'api_key' => array($ini_array['general']['api_key']) - ); - */ } diff --git a/install/include/installInit.php b/install/include/installInit.php index ee0854e1e..b1ccb8219 100644 --- a/install/include/installInit.php +++ b/install/include/installInit.php @@ -34,6 +34,11 @@ function CreateINIFile(){ echo "Could not copy recorder.cfg to /etc/airtime/. Exiting."; exit(1); } + + if (!copy(__DIR__."/../../python_apps/pypo/scripts/liquidsoap.cfg", "/etc/airtime/liquidsoap.cfg")){ + echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting."; + exit(1); + } } function RemoveINIFile(){ diff --git a/python_apps/pypo/scripts/ls_config.liq b/python_apps/pypo/scripts/liquidsoap.cfg similarity index 60% rename from python_apps/pypo/scripts/ls_config.liq rename to python_apps/pypo/scripts/liquidsoap.cfg index 20b1f4215..a7f310f1a 100644 --- a/python_apps/pypo/scripts/ls_config.liq +++ b/python_apps/pypo/scripts/liquidsoap.cfg @@ -1,9 +1,6 @@ ########################################### # liquidsoap config file # ########################################### -# This config assumes that there are -# two instances of LS running -# the "scheduler" & the "fallback" instance ########################################### @@ -13,13 +10,6 @@ log_file = "/var/log/pypo/