Merge branch '2.3.x' into devel

CREDITS

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

python_apps/pypo/airtime-liquidsoap

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

python_apps/pypo/airtime-liquidsoap-init-d

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

python_apps/pypo/liquidsoap_scripts/ls_script.liq

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