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

CREDITS

@@ -22,6 +22,18 @@ Mikayel Karapetian (michael.karapetian@sourcefabric.org)
 Daniel James (daniel.james@sourcefabric.org)
   Role: Documentor & QA
 
+Localizations:
+
+Albert (French)
+Christoph Rombach, Micz Flor (German)
+Claudia Cruz (Spanish)
+Katerina Michailidis (Greek)
+Hoerich (Austrian)
+Luba Sirina (Russian)
+Luciano De Fazio (Brazilian Portuguese)
+Sebastian Matuszewski (Polish)
+Staff Pingu (Italian)
+
 Version 2.2.1
 -------------
 Martin Konecny (martin.konecny@sourcefabric.org)

airtime_mvc/build/sql/defaultdata.sql

@@ -325,9 +325,12 @@ INSERT INTO cc_pref("keystr", "valstr") VALUES('locale', 'en_CA');
 
 INSERT INTO cc_pref("subjid", "keystr", "valstr") VALUES(1, 'user_locale', 'en_CA');
 
-INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English');
+INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English (Canada)');
+INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_GB', 'English (Britain)');
+INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_US', 'English (USA)');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('cs_CZ', 'Český');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('de_DE', 'Deutsch');
+INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('de_AT', 'Österreichisches Deutsch');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('es_ES', 'Español');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('fr_FR', 'Français');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('it_IT', 'Italiano');

debian/control

@@ -17,6 +17,7 @@ Depends: apache2,
  gzip (>= 1.3.12),
  libao-ocaml,
  libapache2-mod-php5,
+ libc-bin,
  libcamomile-ocaml-data,
  libesd0,
  libmad-ocaml,
@@ -27,6 +28,7 @@ Depends: apache2,
  libsoundtouch-ocaml,
  libtaglib-ocaml,
  liquidsoap (>= 1.0.0~),
+ locales,
  lsof,
  monit,
  multitail,

debian/postinst

@@ -16,7 +16,7 @@ includefile="${configdir}/apache.conf"
 a2tplfile="${configdir}/apache.vhost.tpl"
 phpinifile="${configdir}/airtime.ini"
 OLDVERSION="$2"
-NEWVERSION="2.3.0"
+NEWVERSION="2.3.1"
 
 case "$1" in
   configure|reconfigure)
@@ -229,7 +229,7 @@ case "$1" in
         echo "Upgrades from Airtime versions before 2.1.0 are not supported. Please back up your files and perform a clean install."
 
       elif [ "${APACHESETUP}" == "no thanks" ]; then
-        echo "Please run the ${tmpdir}/install_minimal/airtime-install script after you have set up the web server."
+        echo "Please run the ${tmpdir}/install_minimal/airtime-install script with the -d option after you have set up the web server."
 
       else
 

install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql

@@ -30,9 +30,12 @@ INSERT INTO cc_pref("keystr", "valstr") VALUES('locale', 'en_CA');
 
 INSERT INTO cc_pref("subjid", "keystr", "valstr") VALUES(1, 'user_locale', 'en_CA');
 
-INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English');
+INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English (Canada)');
+INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_GB', 'English (Britain)');
+INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_US', 'English (USA)');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('cs_CZ', 'Český');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('de_DE', 'Deutsch');
+INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('de_AT', 'Österreichisches Deutsch');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('es_ES', 'Español');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('fr_FR', 'Français');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('it_IT', 'Italiano');

python_apps/media-monitor/airtime-media-monitor-init-d

@@ -17,19 +17,24 @@ DAEMON=/usr/lib/airtime/media-monitor/airtime-media-monitor
 PIDFILE=/var/run/airtime-media-monitor.pid
 
 start () {
-        start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE --startas $DAEMON
-        monit monitor airtime-media-monitor >/dev/null 2>&1
+        start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID \
+            --make-pidfile --pidfile $PIDFILE --startas $DAEMON
 }
 
 stop () {
         # Send TERM after 5 seconds, wait at most 30 seconds.
-        monit unmonitor airtime-media-monitor >/dev/null 2>&1
         start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE
         rm -f $PIDFILE
 }
 
-start_no_monit() {
-    start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE --startas $DAEMON
+start_with_monit() {
+    start
+    monit monitor airtime-media-monitor >/dev/null 2>&1
+}
+
+stop_with_monit() {
+    monit unmonitor airtime-media-monitor >/dev/null 2>&1
+    stop
 }
 
 
@@ -53,10 +58,16 @@ case "${1:-''}" in
            start
            echo "Done."
         ;;
-  'start-no-monit')
+  'start-with-monit')
            # restart commands here
            echo -n "Starting $NAME: "
-           start_no_monit
+           start_with_monit
+           echo "Done."
+        ;;
+  'stop-with-monit')
+           # restart commands here
+           echo -n "Stopping $NAME: "
+           stop_with_monit
            echo "Done."
         ;;
   'status')

python_apps/media-monitor/install/media-monitor-initialize.py

@@ -16,6 +16,6 @@ try:
     #Start media-monitor daemon
     if "airtime_service_start" in os.environ and os.environ["airtime_service_start"] == "t":
         print "* Waiting for media-monitor processes to start..."
-        subprocess.call("invoke-rc.d airtime-media-monitor start-no-monit", shell=True)
+        subprocess.call("invoke-rc.d airtime-media-monitor start", shell=True)
 except Exception, e:
     print e

python_apps/pypo/airtime-liquidsoap-init-d

@@ -17,22 +17,6 @@ DAEMON=/usr/lib/airtime/pypo/bin/airtime-liquidsoap
 PIDFILE=/var/run/airtime-liquidsoap.pid
 
 start () {
-        start_no_monit
-        monit monitor airtime-liquidsoap >/dev/null 2>&1
-}
-
-stop () {
-        monit unmonitor airtime-liquidsoap >/dev/null 2>&1
-        #send term signal after 10 seconds
-        timeout -k 5 10 /usr/lib/airtime/airtime_virtualenv/bin/python \
-            /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py        
-        # Send TERM after 5 seconds, wait at most 30 seconds.
-        start-stop-daemon --stop --oknodo --retry=TERM/10/KILL/5 --quiet --pidfile $PIDFILE
-        rm -f $PIDFILE
-        sleep 3
-}
-
-start_no_monit() {
         chown pypo:pypo /var/log/airtime/pypo
         chown pypo:pypo /var/log/airtime/pypo-liquidsoap
         chown pypo:pypo /etc/airtime/liquidsoap.cfg
@@ -45,21 +29,43 @@ start_no_monit() {
             --pidfile $PIDFILE --nicelevel -15 --startas $DAEMON
 }
 
+stop () {
+        #send term signal after 10 seconds
+        timeout -k 5 10 /usr/lib/airtime/airtime_virtualenv/bin/python \
+            /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py        
+        # Send TERM after 5 seconds, wait at most 30 seconds.
+        start-stop-daemon --stop --oknodo --retry=TERM/10/KILL/5 --quiet --pidfile $PIDFILE
+        rm -f $PIDFILE
+        sleep 3
+}
+
+start_with_monit () {
+        start
+        monit monitor airtime-liquidsoap >/dev/null 2>&1
+}
+
+stop_with_monit() {
+        monit unmonitor airtime-liquidsoap >/dev/null 2>&1
+        stop
+}
+
+
+
 
 case "${1:-''}" in
   'stop')
-           echo -n "Stopping Liquidsoap: "
+           echo -n "Stopping $NAME: "
            stop
            echo "Done."
         ;;
   'start')
-           echo -n "Starting Liquidsoap: "
+           echo -n "Starting $NAME: "
            start
            echo "Done."
         ;;
   'restart')
            # restart commands here
-           echo -n "Restarting Liquidsoap: "
+           echo -n "Restarting $NAME: "
            stop
            start
            echo "Done."
@@ -69,22 +75,28 @@ case "${1:-''}" in
         if [ -f "$PIDFILE" ]; then
             pid=`cat $PIDFILE`
             if [ -d "/proc/$pid" ]; then
-                echo "Liquidsoap is running"
+                echo "$NAME is running"
                 exit 0
             fi
         fi
-        echo "Liquidsoap is not running"
+        echo "$NAME is not running"
         exit 1
         ;;
-  'start-no-monit')
+  'start-with-monit')
            # restart commands here
            echo -n "Starting $NAME: "
-           start_no_monit
+           start_with_monit
+           echo "Done."
+        ;;
+  'stop-with-monit')
+           # restart commands here
+           echo -n "Stopping $NAME: "
+           stop_with_monit
            echo "Done."
         ;;
 
   *)      # no parameter specified
-        echo "Usage: $SELF start|stop|restart"
+        echo "Usage: $SELF start|stop|restart|status"
         exit 1
         ;;
 

python_apps/pypo/airtime-playout-init-d

@@ -10,7 +10,7 @@
 ### END INIT INFO
 
 USERID=root
-NAME="Airtime Scheduler Engine"
+NAME="Airtime Scheduler"
 
 DAEMON=/usr/lib/airtime/pypo/bin/airtime-playout
 PIDFILE=/var/run/airtime-playout.pid
@@ -18,21 +18,24 @@ PIDFILE=/var/run/airtime-playout.pid
 start () {
         chown pypo:pypo /etc/airtime
         chown pypo:pypo /etc/airtime/liquidsoap.cfg
-    
-        start-stop-daemon --start --background --quiet --chuid $USERID:$USERID --make-pidfile --pidfile $PIDFILE --startas $DAEMON
-        monit monitor airtime-playout >/dev/null 2>&1
+        start-stop-daemon --start --background --quiet --chuid $USERID:$USERID \
+            --make-pidfile --pidfile $PIDFILE --startas $DAEMON
 }
 
 stop () {
         # Send TERM after 5 seconds, wait at most 30 seconds.
-        
-        monit unmonitor airtime-playout >/dev/null 2>&1
         start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE
         rm -f $PIDFILE
 }
 
-start_no_monit() {
-        start-stop-daemon --start --background --quiet --chuid $USERID:$USERID --make-pidfile --pidfile $PIDFILE --startas $DAEMON        
+start_with_monit() {
+    start
+    monit monitor airtime-playout >/dev/null 2>&1
+}
+
+stop_with_monit() {
+    monit unmonitor airtime-playout >/dev/null 2>&1
+    stop
 }
 
 case "${1:-''}" in
@@ -55,12 +58,19 @@ case "${1:-''}" in
            start
            echo "Done."
         ;;
-  'start-no-monit')
+  'start-with-monit')
            # restart commands here
            echo -n "Starting $NAME: "
-           start_no_monit
+           start_with_monit
            echo "Done."
         ;;
+  'stop-with-monit')
+           # restart commands here
+           echo -n "Stopping $NAME: "
+           stop_with_monit
+           echo "Done."
+        ;;
+
   'status')
            # status commands here
            /usr/bin/airtime-check-system

python_apps/pypo/install/pypo-initialize.py

@@ -88,8 +88,8 @@ try:
 
     if "airtime_service_start" in os.environ and os.environ["airtime_service_start"] == "t":
         print "* Waiting for pypo processes to start..."
-        subprocess.call("invoke-rc.d airtime-playout start-no-monit  > /dev/null 2>&1", shell=True)
-        subprocess.call("invoke-rc.d airtime-liquidsoap start-no-monit  > /dev/null 2>&1", shell=True)
+        subprocess.call("invoke-rc.d airtime-playout start > /dev/null 2>&1", shell=True)
+        subprocess.call("invoke-rc.d airtime-liquidsoap start > /dev/null 2>&1", shell=True)
 
 except Exception, e:
     print e