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

Merge branch '2.3.x' into 2.3.x-saas

This commit is contained in:
Martin Konecny 2013-04-03 16:48:37 -04:00
parent 2d2aa8eb46 ec7c898f5a
commit 5dd54783c0
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CREDITS
View File

@ -25,10 +25,10 @@ Daniel James (daniel.james@sourcefabric.org)
Localizations: Localizations:
Albert (French) Albert (French)
Christoph Rombach, Micz Flor (German) Helmut Müller, Christoph Rombach, Micz Flor (German)
Claudia Cruz (Spanish) Claudia Cruz (Spanish)
Katerina Michailidis (Greek) Katerina Michailidis (Greek)
Hoerich (Austrian) Erich Pöttinger (Austrian)
Luba Sirina (Russian) Luba Sirina (Russian)
Luciano De Fazio (Brazilian Portuguese) Luciano De Fazio (Brazilian Portuguese)
Sebastian Matuszewski (Polish) Sebastian Matuszewski (Polish)

1
python_apps/pypo/airtime-liquidsoap
View File

@ -3,7 +3,6 @@
virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
. ${virtualenv_bin}activate . ${virtualenv_bin}activate
ls_user="pypo"
export HOME="/var/tmp/airtime/pypo/" export HOME="/var/tmp/airtime/pypo/"
api_client_path="/usr/lib/airtime/" api_client_path="/usr/lib/airtime/"
ls_path="/usr/bin/airtime-liquidsoap --verbose -f -d" ls_path="/usr/bin/airtime-liquidsoap --verbose -f -d"

1
python_apps/pypo/airtime-liquidsoap-init-d
View File

@ -21,7 +21,6 @@ start () {
chown pypo:pypo /var/log/airtime/pypo-liquidsoap chown pypo:pypo /var/log/airtime/pypo-liquidsoap
chown pypo:pypo /etc/airtime/liquidsoap.cfg chown pypo:pypo /etc/airtime/liquidsoap.cfg
rm -f $PIDFILE
touch $PIDFILE touch $PIDFILE
chown pypo:pypo $PIDFILE chown pypo:pypo $PIDFILE

1
python_apps/pypo/liquidsoap_scripts/ls_script.liq
View File

@ -1,7 +1,6 @@
%include "/etc/airtime/liquidsoap.cfg" %include "/etc/airtime/liquidsoap.cfg"
set("log.file.path", log_file) set("log.file.path", log_file)
set("log.stdout", true)
set("server.telnet", true) set("server.telnet", true)
set("server.telnet.port", 1234) set("server.telnet.port", 1234)
set("init.daemon.pidfile.path", "/var/run/airtime-liquidsoap.pid") set("init.daemon.pidfile.path", "/var/run/airtime-liquidsoap.pid")