Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
naomiaro 2011-01-13 18:29:33 -05:00
commit 37c96d3695
5 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build/build.properties
View file

@ -1,4 +1,6 @@
project.home = /home/naomiaro/dev-campcaster/campcaster #Note: project.home is automatically generated by the propel-install script.
#Any manual changes to this value will be overwritten.
project.home = /path/to/airtime
project.build = ${project.home}/build project.build = ${project.home}/build
#Database driver #Database driver

18
install/propel-install.php
View file

@ -31,23 +31,17 @@ if(exec("whoami") != "root"){
$property = 'project.home'; $property = 'project.home';
$lines = file('../build/build.properties'); $lines = file('../build/build.properties');
foreach ($lines as $line) { foreach ($lines as $key => &$line) {
if ($property == substr($line, 0, strlen($property))){ if ($property == substr($line, 0, strlen($property))){
$indexOfEquals = strpos($line, '='); $line = $property." = ".realpath(__dir__.'/../')."\n";
if ($indexOfEquals !== false){
$dir_value = trim(substr($line, $indexOfEquals+1));
//check to make sure that the project.home path is equal to one level
//up of this install script location.
$dir_found = realpath(__dir__.'/../') == realpath($dir_value);
}
break;
} }
} }
if ($dir_found === false){ $fp=fopen('../build/build.properties', 'w');
echo ("../build/build.properties 'project.home' value of '$dir_value' is incorrect. Please correct and try install again.\n"); foreach($lines as $key => $line){
exit(1); fwrite($fp, $line);
} }
fclose($fp);
echo "******************************* Install Begin ********************************\n"; echo "******************************* Install Begin ********************************\n";

3
pypo/install/pypo-install.py
View file

@ -35,6 +35,9 @@ def create_user(username):
print "Creating user "+username print "Creating user "+username
os.system("adduser --system --quiet --group --shell /bin/bash "+username) os.system("adduser --system --quiet --group --shell /bin/bash "+username)
#add pypo to audio group
os.system("adduser " + username + " audio")
#set pypo password #set pypo password
p = os.popen('/usr/bin/passwd pypo', 'w') p = os.popen('/usr/bin/passwd pypo', 'w')
p.write('pypo\n') p.write('pypo\n')

2
pypo/pypo-cli.py
View file

@ -693,6 +693,8 @@ class Playout:
# Get any extra information for liquidsoap (which will be sent back to us) # Get any extra information for liquidsoap (which will be sent back to us)
liquidsoap_data = self.api_client.get_liquidsoap_data(pkey, schedule) liquidsoap_data = self.api_client.get_liquidsoap_data(pkey, schedule)
logger.debug("Sending additional data to liquidsoap: "+liquidsoap_data) logger.debug("Sending additional data to liquidsoap: "+liquidsoap_data)
#Sending JSON string. Example: {"schedule_id":"13"}
tn.write("vars.pypo_data "+liquidsoap_data+"\n") tn.write("vars.pypo_data "+liquidsoap_data+"\n")
tn.write(self.export_source + '.flip') tn.write(self.export_source + '.flip')

18
pypo/scripts/ls_script.liq
View file

@ -94,13 +94,13 @@ source = smooth_add(normal=source,special=special)
# Stream Output # Stream Output
##################################### #####################################
# finally the output | mp3 # finally the output | mp3
clock(id="clock_icecast", #clock(id="clock_icecast",
output.icecast(%mp3, # output.icecast(%mp3,
host = icecast_host, port = icecast_port, # host = icecast_host, port = icecast_port,
password = icecast_pass, mount = mount_scheduler, # password = icecast_pass, mount = mount_scheduler,
fallible = true, # fallible = true,
restart = true, # restart = true,
restart_delay = 5, # restart_delay = 5,
buffer(source))) # buffer(source)))
#output.dummy(live_in) out(source)