Merge branch 'master' of dev.sourcefabric.org:campcaster

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/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/<script>.log"
 log_level = 3
 
-# archive directory
-archive_dir = "/opt/pypo/archive/"
-
-# list pointing to the current couchcaster mountpoint 
-couchcaster_list = "http://vdeb.openbroadcast.ch/mod/ml/api/pypo/current_couchcaster"
-
-
 ###########################################
 # stream settings                         #
 ###########################################
@@ -27,22 +17,22 @@ icecast_host = "127.0.0.1"
 icecast_port = 8000
 icecast_pass = "hackme"
 
-# mountpoints
+###########################################
+# webstream mountpoint names              #
+###########################################
 mount_point_mp3 = "airtime.mp3"
 mount_point_vorbis = "airtime.ogg"
 
-# mount intra is used for scheduler >>> fallback stream
-mount_intra = "pypo_intra"
-
-# intra-LS streaming (no icecast here)
-intra_host = "127.0.0.1"
-intra_port = 9000
-intra_pass = "hackme"
-
+###########################################
+# webstream metadata settings             #
+###########################################
 icecast_url = "http://airtime.sourcefabric.org"
 icecast_description = "Airtime Radio!"
 icecast_genre = "genre"
 
+###########################################
+#liquidsoap output settings              #
+###########################################
 output_sound_device = false
 output_icecast_vorbis = false
 output_icecast_mp3 = true

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)