Merge branch 'saas-dev' into soundcloud

airtime_mvc/application/views/scripts/systemstatus/index.phtml

@@ -181,6 +181,7 @@
                 ?>
             </td>
         </tr>
+    </tbody>
  */?>
     <tr id="partitions" class="even">
         <th colspan="5"><?php echo _("Disk Space") ?></th>
@@ -203,5 +204,4 @@
             <div><?php echo sprintf("%01.1f%% ", $used/$total*100) .  _("in use") ?></div>
         </td>
     </tr>
-    </tbody>
 </table>

airtime_mvc/build/airtime.example.conf

@@ -4,8 +4,8 @@
 #
 # This is an example configuration for Airtime. If you just want to
 # get started with a basic Airtime setup, or don't know if you should
-# be reconfiguring any of the following values, just rename this file
+# be reconfiguring any of the following values, just move this file
-# to 'airtime.conf'.
+# to '/etc/airtime/' and rename it 'airtime.conf'.
 #
 # ----------------------------------------------------------------------
 
@@ -37,6 +37,11 @@
 #                    engine (pypo) should cache scheduled media files.
 #                    The default is 1.
 #
+# airtime_dir:       Only used in saas, needed for compatibility.
+#
+# station_id:        The Airtime station name.
+#                    Only used in saas, needed for compatibility.
+#
 [general]
 api_key =
 web_server_user = www-data
@@ -44,6 +49,8 @@ base_url = localhost
 base_port = 80
 base_dir = /
 cache_ahead_hours = 1
+airtime_dir =
+station_id =
 #
 # ----------------------------------------------------------------------
 
@@ -107,6 +114,23 @@ vhost = /airtime
 # ----------------------------------------------------------------------
 
 
+# ----------------------------------------------------------------------
+#                               M O N I T
+# ----------------------------------------------------------------------
+#
+# These settings are only for backwards compatibility.
+#
+# user:     The username for the monit user.
+#
+# password: The password for the monit user.
+#
+[monit]
+user =
+password =
+#
+# ----------------------------------------------------------------------
+
+
 # ----------------------------------------------------------------------
 #                         M E D I A   M O N I T O R
 # ----------------------------------------------------------------------
@@ -132,10 +156,12 @@ vhost = /airtime
 #                          The default is 0.1
 #
 # logpath:                 The media monitor log file path
-#                          The default is '/var/log/airtime/media-monitor/media-monitor.log'
+#                          The default is
+#                           '/var/log/airtime/media-monitor/media-monitor.log'
 #
 # index_path:              The media monitor index path
-#                          The default is '/var/tmp/airtime/media-monitor/last_index'
+#                          The default is
+#                           '/var/tmp/airtime/media-monitor/last_index'
 #
 [media-monitor]
 check_filesystem_events = 5

install

@@ -467,11 +467,11 @@ verbose "\n * Installing pypo..."
 loudCmd "python ${AIRTIMEROOT}/python_apps/pypo/setup.py install --install-scripts=/usr/bin"
 verbose "...Done"
 
-for i in /etc/init/airtime*.template; do
+#for i in /etc/init/airtime*.template; do
-    chmod 644 $i
+#    chmod 644 $i
-    sed -i "s/WEB_USER/${web_user}/g" $i
+#    sed -i "s/WEB_USER/${web_user}/g" $i
-    mv $i ${i%.template}
+#    mv $i ${i%.template}
-done
+#done
 
 set +e
 loudCmd "initctl reload-configuration"

installer/apache/airtime-vhost-2.4

@@ -2,8 +2,32 @@
    ServerAdmin foo@bar.org
    DocumentRoot WEB_ROOT
    php_admin_value upload_tmp_dir /tmp
+   php_value post_max_size 500M
+   php_value upload_max_filesize 500M
+   php_value request_order "GPC"
+   php_value session.gc_probability 0
+   php_value session.auto_start 0
+
+   AddOutputFilterByType DEFLATE text/plain
+   AddOutputFilterByType DEFLATE text/html
+   AddOutputFilterByType DEFLATE text/xml
+   AddOutputFilterByType DEFLATE text/css
+   AddOutputFilterByType DEFLATE application/xml
+   AddOutputFilterByType DEFLATE application/xhtml+xml
+   AddOutputFilterByType DEFLATE application/rss+xml
+   AddOutputFilterByType DEFLATE application/javascript
+   AddOutputFilterByType DEFLATE application/x-javascript
+   AddOutputFilterByType DEFLATE application/json
+
 
   <Directory WEB_ROOT>
+      RewriteEngine On
+      RewriteCond %{REQUEST_FILENAME} -s [OR]
+      RewriteCond %{REQUEST_FILENAME} -l [OR]
+      RewriteCond %{REQUEST_FILENAME} -d
+      RewriteRule ^.*$ - [NC,L]
+      RewriteRule ^.*$ index.php [NC,L]
+
       DirectoryIndex index.php
       AllowOverride all
       Order allow,deny

python_apps/media-monitor/setup.py

@@ -22,7 +22,7 @@ else:
             mm2_files.append(os.path.join(root, filename))
         
     data_files = [
-                  ('/etc/init', ['install/upstart/airtime-media-monitor.conf.template']),
+                  # ('/etc/init', ['install/upstart/airtime-media-monitor.conf.template']),
                   ('/etc/init.d', ['install/sysvinit/airtime-media-monitor']),
                   ('/etc/airtime', ['install/media_monitor_logging.cfg']),
                   ('/var/log/airtime/media-monitor', []),

python_apps/pypo/setup.py

@@ -18,8 +18,8 @@ else:
             pypo_files.append(os.path.join(root, filename))
         
     data_files = [
-                  ('/etc/init', ['install/upstart/airtime-playout.conf.template']),
+                  # ('/etc/init', ['install/upstart/airtime-playout.conf.template']),
-                  ('/etc/init', ['install/upstart/airtime-liquidsoap.conf.template']),
+                  # ('/etc/init', ['install/upstart/airtime-liquidsoap.conf.template']),
                   ('/etc/init.d', ['install/sysvinit/airtime-playout']),
                   ('/etc/init.d', ['install/sysvinit/airtime-liquidsoap']),
                   ('/var/log/airtime/pypo', []),