CC-2044: remove hardcoded settings from application/configs/conf.php

-moved liquidsoap config to /etc/airtime as well

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'])
-        );
-        */
 }

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(){

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)