From 89d2c317cb84855fafc402e8b68941fbf3b39ac3 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 29 Mar 2011 20:44:04 -0400 Subject: [PATCH] CC-2044: remove hardcoded settings from application/configs/conf.php -moved liquidsoap config to /etc/airtime as well --- application/configs/conf.php | 11 ----------- install/include/installInit.php | 5 +++++ .../pypo/scripts/{ls_config.liq => liquidsoap.cfg} | 0 python_apps/pypo/scripts/ls_script.liq | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) rename python_apps/pypo/scripts/{ls_config.liq => liquidsoap.cfg} (100%) 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 100% rename from python_apps/pypo/scripts/ls_config.liq rename to python_apps/pypo/scripts/liquidsoap.cfg diff --git a/python_apps/pypo/scripts/ls_script.liq b/python_apps/pypo/scripts/ls_script.liq index 5fec857ea..416e0b420 100644 --- a/python_apps/pypo/scripts/ls_script.liq +++ b/python_apps/pypo/scripts/ls_script.liq @@ -1,5 +1,5 @@ %include "library/pervasives.liq" -%include "ls_config.liq" +%include "/etc/airtime/liquidsoap.cfg" set("log.file.path", log_file) set("log.stdout", true)