CC-2693: Copy PHP files to /usr/shar/airtime instead of /var/www/airtime

- done for new install
- upgrade need some more work

VERSION

@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=1.9.1
+PRODUCT_RELEASE=1.9.2

airtime_mvc/application/configs/constants.php

@@ -1,6 +1,6 @@
 <?php
 
-define('AIRTIME_VERSION', '1.9.1');
+define('AIRTIME_VERSION', '1.9.2');
 define('AIRTIME_COPYRIGHT_DATE', '2010-2011');
 define('AIRTIME_REST_VERSION', '1.1');
 

install_full/apache/airtime-vhost

@@ -1,9 +1,9 @@
 <VirtualHost *:80>
    ServerAdmin foo@bar.org
-   DocumentRoot /var/www/airtime/public
+   DocumentRoot /usr/share/airtime/public
    php_admin_value upload_tmp_dir /tmp
 
-  <Directory /var/www/airtime/public>
+  <Directory /usr/share/airtime/public>
       DirectoryIndex index.php
       AllowOverride all
       Order allow,deny

install_minimal/include/AirtimeInstall.php

@@ -6,7 +6,7 @@ require_once('DB.php');
 class AirtimeInstall
 {
     const CONF_DIR_BINARIES = "/usr/lib/airtime";
-    const CONF_DIR_WWW = "/var/www/airtime";
+    const CONF_DIR_WWW = "/usr/share/airtime/";
     const CONF_DIR_LOG = "/var/log/airtime";
 
     public static $databaseTablesCreated = false;

install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php

@@ -569,14 +569,15 @@ class Airtime190Upgrade{
     }
 
 
-    public static function removeOldAirtimeImport(){
+    // we don't need thses functions anymore as it's done in CreateSymlinksToUtils()
+    /*public static function removeOldAirtimeImport(){
         exec('rm -f "/usr/bin/airtime-import"');
     }
 
     public static function updateAirtimeImportSymLink(){
         $dir = "/usr/lib/airtime/utils/airtime-import/airtime-import";
         exec("ln -s $dir /usr/bin/airtime-import");
-    }
+    }*/
 
     public static function execSqlQuery($sql){
         global $CC_DBC;
@@ -793,8 +794,9 @@ Airtime190Upgrade::CopyUtils();
 /* James made a new airtime-import script, lets remove the old airtime-import php script,
  *install the new airtime-import.py script and update the /usr/bin/symlink.
  */
-Airtime190Upgrade::removeOldAirtimeImport();
+// we don't need thses functions anymore as it's done in CreateSymlinksToUtils()
-Airtime190Upgrade::updateAirtimeImportSymLink();
+/*Airtime190Upgrade::removeOldAirtimeImport();
+Airtime190Upgrade::updateAirtimeImportSymLink();*/
 
 Airtime190Upgrade::connectToDatabase();
 

install_minimal/upgrades/airtime-1.9.2/airtime-monit.cfg.192

@@ -0,0 +1,23 @@
+ set daemon 10 # Poll at 10 second intervals
+ set logfile syslog facility log_daemon
+
+ set httpd port 2812 and use address 127.0.0.1
+    allow localhost
+    allow admin:monit
+
+ check process airtime-playout
+    with pidfile "/var/run/airtime-playout.pid"
+    start program = "/etc/init.d/airtime-playout start" with timeout 10 seconds
+    stop program = "/etc/init.d/airtime-playout stop"
+ check process airtime-liquidsoap
+    with pidfile "/var/run/airtime-liquidsoap.pid"
+    start program = "/etc/init.d/airtime-playout start" with timeout 10 seconds
+    stop program = "/etc/init.d/airtime-playout stop"
+# check process airtime-media-monitor
+#    with pidfile "/var/run/airtime-media-monitor.pid"
+#    start program = "/etc/init.d/airtime-media-monitor start" with timeout 10 seconds
+#    stop program = "/etc/init.d/airtime-media-monitor stop"
+ check process airtime-show-recorder
+    with pidfile "/var/run/airtime-show-recorder.pid"
+    start program = "/etc/init.d/airtime-show-recorder start" with timeout 10 seconds
+    stop program = "/etc/init.d/airtime-show-recorder stop"

install_minimal/upgrades/airtime-1.9.2/airtime-upgrade.php

@@ -0,0 +1,171 @@
+<?php
+    class Airtime192Upgrade{
+
+        public static function InstallAirtimePhpServerCode($phpDir)
+        {
+    
+            $AIRTIME_SRC = realpath(__DIR__.'/../../../airtime_mvc');
+    
+            echo "* Installing PHP code to ".$phpDir.PHP_EOL;
+            exec("mkdir -p ".$phpDir);
+            exec("cp -R ".$AIRTIME_SRC."/* ".$phpDir);
+        }
+        
+    }
+    
+    class AirtimeIni{
+
+        const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf";
+        const CONF_FILE_PYPO = "/etc/airtime/pypo.cfg";
+        const CONF_FILE_RECORDER = "/etc/airtime/recorder.cfg";
+        const CONF_FILE_LIQUIDSOAP = "/etc/airtime/liquidsoap.cfg";
+        const CONF_FILE_MEDIAMONITOR = "/etc/airtime/media-monitor.cfg";
+        const CONF_FILE_API_CLIENT = "/etc/airtime/api_client.cfg";
+        const CONF_FILE_MONIT = "/etc/monit/conf.d/airtime-monit.cfg";
+    
+        /**
+         * This function updates an INI style config file.
+         *
+         * A property and the value the property should be changed to are
+         * supplied. If the property is not found, then no changes are made.
+         *
+         * @param string $p_filename
+         *      The path the to the file.
+         * @param string $p_property
+         *      The property to look for in order to change its value.
+         * @param string $p_value
+         *      The value the property should be changed to.
+         *
+         */
+        public static function UpdateIniValue($p_filename, $p_property, $p_value)
+        {
+            $lines = file($p_filename);
+            $n=count($lines);
+            foreach ($lines as &$line) {
+                if ($line[0] != "#"){
+                    $key_value = explode("=", $line);
+                    $key = trim($key_value[0]);
+    
+                    if ($key == $p_property){
+                        $line = "$p_property = $p_value".PHP_EOL;
+                    }
+                }
+            }
+    
+            $fp=fopen($p_filename, 'w');
+            for($i=0; $i<$n; $i++){
+                fwrite($fp, $lines[$i]);
+            }
+            fclose($fp);
+        }
+    
+        public static function ReadPythonConfig($p_filename)
+        {
+            $values = array();
+    
+            $lines = file($p_filename);
+            $n=count($lines);
+            for ($i=0; $i<$n; $i++) {
+                if (strlen($lines[$i]) && !in_array(substr($lines[$i], 0, 1), array('#', PHP_EOL))){
+                     $info = explode("=", $lines[$i]);
+                     $values[trim($info[0])] = trim($info[1]);
+                 }
+            }
+    
+            return $values;
+        }
+    
+        public static function MergeConfigFiles($configFiles, $suffix) {
+            foreach ($configFiles as $conf) {
+                if (file_exists("$conf$suffix.bak")) {
+    
+                    if($conf === AirtimeIni::CONF_FILE_AIRTIME) {
+                        // Parse with sections
+                        $newSettings = parse_ini_file($conf, true);
+                        $oldSettings = parse_ini_file("$conf$suffix.bak", true);
+                    }
+                    else {
+                        $newSettings = AirtimeIni::ReadPythonConfig($conf);
+                        $oldSettings = AirtimeIni::ReadPythonConfig("$conf$suffix.bak");
+                    }
+    
+                    $settings = array_keys($newSettings);
+    
+                    foreach($settings as $section) {
+                        if(isset($oldSettings[$section])) {
+                            if(is_array($oldSettings[$section])) {
+                                $sectionKeys = array_keys($newSettings[$section]);
+                                foreach($sectionKeys as $sectionKey) {
+                                    if(isset($oldSettings[$section][$sectionKey])) {
+                                        AirtimeIni::UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]);
+                                    }
+                                }
+                            }
+                            else {
+                                AirtimeIni::UpdateIniValue($conf, $section, $oldSettings[$section]);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    
+        public static function upgradeConfigFiles(){
+    
+            $configFiles = array(AirtimeIni::CONF_FILE_AIRTIME,
+                                 AirtimeIni::CONF_FILE_PYPO,
+                                 AirtimeIni::CONF_FILE_RECORDER,
+                                 AirtimeIni::CONF_FILE_LIQUIDSOAP);
+    
+            // Backup the config files
+            $suffix = date("Ymdhis")."-1.9.0";
+            foreach ($configFiles as $conf) {
+                if (file_exists($conf)) {
+                    echo "Backing up $conf to $conf$suffix.bak".PHP_EOL;
+                    copy($conf, $conf.$suffix.".bak");
+                }
+            }
+    
+            $default_suffix = "192";
+            AirtimeIni::CreateIniFiles($default_suffix);
+            AirtimeIni::MergeConfigFiles($configFiles, $suffix);
+        }
+    
+        /**
+         * This function creates the /etc/airtime configuration folder
+         * and copies the default config files to it.
+         */
+        public static function CreateIniFiles($suffix)
+        {
+            if (!file_exists("/etc/airtime/")){
+                if (!mkdir("/etc/airtime/", 0755, true)){
+                    echo "Could not create /etc/airtime/ directory. Exiting.";
+                    exit(1);
+                }
+            }
+    
+            if (!copy(__DIR__."/airtime.conf.$suffix", AirtimeIni::CONF_FILE_AIRTIME)){
+                echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
+                exit(1);
+            }
+            if (!copy(__DIR__."/pypo.cfg.$suffix", AirtimeIni::CONF_FILE_PYPO)){
+                echo "Could not copy pypo.cfg to /etc/airtime/. Exiting.";
+                exit(1);
+            }
+            if (!copy(__DIR__."/recorder.cfg.$suffix", AirtimeIni::CONF_FILE_RECORDER)){
+                echo "Could not copy recorder.cfg to /etc/airtime/. Exiting.";
+                exit(1);
+            }
+            if (!copy(__DIR__."/liquidsoap.cfg.$suffix", AirtimeIni::CONF_FILE_LIQUIDSOAP)){
+                echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting.";
+                exit(1);
+            }
+        }
+    }
+    
+    AirtimeIni::upgradeConfigFiles();
+    
+    $values = parse_ini_file(AirtimeIni::CONF_FILE_AIRTIME, true);
+    $phpDir = $values['general']['airtime_dir'];
+    Airtime192Upgrade::InstallAirtimePhpServerCode($phpDir);
+?>

install_minimal/upgrades/airtime-1.9.2/airtime.conf.192

@@ -0,0 +1,23 @@
+[database]
+host = localhost
+dbname = airtime
+dbuser = airtime
+dbpass = airtime
+
+[rabbitmq]
+host = 127.0.0.1
+port = 5672
+user = guest
+password = guest
+vhost = /
+
+[general]
+api_key = AAA
+web_server_user = www-data
+airtime_dir = /usr/share/airtime/
+base_url = localhost
+base_port = 80
+
+[soundcloud]
+connection_retries = 3
+time_between_retries = 60

install_minimal/upgrades/airtime-1.9.2/api_client.cfg.192

@@ -0,0 +1,110 @@
+bin_dir = "/usr/lib/airtime/api_clients"
+
+#############################
+## Common
+#############################
+
+# Value needed to access the API
+api_key = 'AAA'
+
+# Path to the base of the API
+api_base = 'api'
+
+# URL to get the version number of the server API
+version_url = 'version/api_key/%%api_key%%'
+
+# Hostname
+base_url = 'localhost'
+base_port = 80
+
+#############################
+## Config for Media Monitor
+#############################
+
+# URL to setup the media monitor
+media_setup_url = 'media-monitor-setup/format/json/api_key/%%api_key%%'
+
+# Tell Airtime the file id associated with a show instance.
+upload_recorded = 'upload-recorded/format/json/api_key/%%api_key%%/fileid/%%fileid%%/showinstanceid/%%showinstanceid%%'
+
+# URL to tell Airtime to update file's meta data
+update_media_url = 'reload-metadata/format/json/api_key/%%api_key%%/mode/%%mode%%'
+
+# URL to tell Airtime we want a listing of all files it knows about
+list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%'
+
+# URL to tell Airtime we want a listing of all dirs its watching (including the stor dir)
+list_all_watched_dirs = 'list-all-watched-dirs/format/json/api_key/%%api_key%%'
+
+# URL to tell Airtime we want to add watched directory
+add_watched_dir = 'add-watched-dir/format/json/api_key/%%api_key%%/path/%%path%%'
+
+# URL to tell Airtime we want to add watched directory
+remove_watched_dir = 'remove-watched-dir/format/json/api_key/%%api_key%%/path/%%path%%'
+
+# URL to tell Airtime we want to add watched directory
+set_storage_dir = 'set-storage-dir/format/json/api_key/%%api_key%%/path/%%path%%'
+
+
+#############################
+## Config for Recorder
+#############################
+
+# URL to get the schedule of shows set to record
+show_schedule_url = 'recorded-shows/format/json/api_key/%%api_key%%'
+
+# URL to upload the recorded show's file to Airtime
+upload_file_url = 'upload-file/format/json/api_key/%%api_key%%'
+
+#number of retries to upload file if connection problem
+upload_retries = 3
+
+#time to wait between attempts to upload file if connection problem (in seconds)
+upload_wait = 60
+
+################################################################################
+# Uncomment *one of the sets* of values from the API clients below, and comment
+# out all the others.
+################################################################################
+
+#############################
+## Config for Pypo
+#############################
+
+# Schedule export path.
+# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
+# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
+export_url = 'schedule/api_key/%%api_key%%'
+
+get_media_url = 'get-media/file/%%file%%/api_key/%%api_key%%'
+
+# Update whether a schedule group has begun playing.
+update_item_url = 'notify-schedule-group-play/api_key/%%api_key%%/schedule_id/%%schedule_id%%'
+
+# Update whether an audio clip is currently playing.
+update_start_playing_url = 'notify-media-item-start-play/api_key/%%api_key%%/media_id/%%media_id%%/schedule_id/%%schedule_id%%'
+
+# ???
+generate_range_url = 'generate_range_dp.php'
+
+
+##############
+# OBP config #
+##############
+
+# URL to get the version number of the server API
+#version_url = 'api/pypo/status/json'
+
+# Schedule export path.
+# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
+# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
+
+# Update whether an item has been played.
+#update_item_url = 'api/pypo/update_shedueled_item/$$item_id%%?played=%%played%%' 
+
+# Update whether an item is currently playing.
+#update_start_playing_url = 'api/pypo/mod/medialibrary/?playlist_type=%%playlist_type%%&export_source=%%export_source%%&media_id=%%media_id%%&playlist_id=%%playlist_id%%&transmission_id=%%transmission_id%%'
+
+# ???
+#generate_range_url = 'api/pypo/generate_range_dp/'
+

install_minimal/upgrades/airtime-1.9.2/liquidsoap.cfg.192

@@ -0,0 +1,55 @@
+###########################################
+# Liquidsoap config file                  #
+###########################################
+
+###########################################
+# Output settings                         #
+###########################################
+output_sound_device = false
+output_icecast_vorbis = true
+output_icecast_mp3 = false
+output_shoutcast = false
+
+#output_bitrate = 128
+#output_samplerate = 44100
+#output_stereo = true
+
+###########################################
+# Logging settings                        #
+###########################################
+log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"
+#log_level = 3
+
+###########################################
+# Icecast Stream settings                 #
+###########################################
+icecast_host = "127.0.0.1"
+icecast_port = 8000
+icecast_pass = "hackme"
+
+# Icecast mountpoint names
+mount_point_mp3 = "airtime.mp3"
+mount_point_vorbis = "airtime.ogg"
+
+# Webstream metadata settings
+icecast_url = "http://airtime.sourcefabric.org"
+icecast_description = "Airtime Radio!"
+icecast_genre = "genre"
+
+# Audio stream metadata for vorbis/ogg is disabled by default
+# due to a number of client media players that disconnect
+# when the metadata changes to a new track. Some versions of
+# mplayer and VLC have this problem. Enable this option at your
+# own risk!
+output_icecast_vorbis_metadata = false
+
+###########################################
+# Shoutcast Stream settings               #
+###########################################
+shoutcast_host = "127.0.0.1"
+shoutcast_port = 9000
+shoutcast_pass = "testing"
+
+# Webstream metadata settings
+shoutcast_url = "http://airtime.sourcefabric.org"
+shoutcast_genre = "genre"

install_minimal/upgrades/airtime-1.9.2/media-monitor.cfg.192

@@ -0,0 +1,21 @@
+api_client = "airtime"
+
+# where the binary files live
+bin_dir = '/usr/lib/airtime/media-monitor'
+
+# where the logging files live
+log_dir = '/var/log/airtime/media-monitor'
+
+
+############################################
+# RabbitMQ settings                        #
+############################################
+rabbitmq_host = 'localhost'
+rabbitmq_user = 'guest'
+rabbitmq_password = 'guest'
+
+############################################
+# Media-Monitor preferences                         #
+############################################
+check_filesystem_events = 5 #how long to queue up events performed on the files themselves.
+check_airtime_events = 30 #how long to queue metadata input from airtime.

install_minimal/upgrades/airtime-1.9.2/pypo.cfg.192

@@ -0,0 +1,72 @@
+############################################
+# pypo - configuration                     #
+############################################
+
+# Set the type of client you are using.
+# Currently supported types:
+# 1) "obp" = Open Broadcast Platform
+# 2) "airtime"
+#
+api_client = "airtime"
+
+############################################
+# Cache Directories                        #
+# *include* trailing slash !!              #
+############################################
+cache_dir = '/var/tmp/airtime/pypo/cache/'
+file_dir = '/var/tmp/airtime/pypo/files/' 
+tmp_dir = '/var/tmp/airtime/pypo/tmp/'
+
+############################################
+# Setup Directories                        #
+# Do *not* include trailing slash !!         #
+############################################
+cache_base_dir = '/var/tmp/airtime/pypo'
+bin_dir = '/usr/lib/airtime/pypo'
+log_base_dir = '/var/log/airtime'
+pypo_log_dir = '/var/log/airtime/pypo'
+liquidsoap_log_dir = '/var/log/airtime/pypo-liquidsoap'
+
+############################################
+# Liquidsoap settings                      #
+############################################
+ls_host = '127.0.0.1'
+ls_port = '1234'
+
+############################################
+# RabbitMQ settings                        #
+############################################
+rabbitmq_host = 'localhost'
+rabbitmq_user = 'guest'
+rabbitmq_password = 'guest'
+
+############################################
+# pypo preferences                         #
+############################################
+prepare_ahead = 24 #in hours
+cache_for = 24 #how long to hold the cache, in hours
+
+# Poll interval in seconds.
+#
+# This will rarely need to be changed because any schedule changes are 
+# automatically sent to pypo immediately. 
+#
+# This is how often the poll script downloads new schedules and files from the
+# server in the event that no changes are made to the schedule.
+#
+poll_interval = 3600 # in seconds.
+
+
+# Push interval in seconds.
+#
+# This is how often the push script checks whether it has something new to
+# push to liquidsoap.
+#
+# It's hard to imagine a situation where this should be more than 1 second.
+#
+push_interval = 1 # in seconds
+
+# 'pre' or 'otf'. 'pre' cues while playlist preparation
+# while 'otf' (on the fly) cues while loading into ls  
+# (needs the post_processor patch)
+cue_style = 'pre'

install_minimal/upgrades/airtime-1.9.2/recorder.cfg.192

@@ -0,0 +1,26 @@
+api_client = "airtime"
+
+# where the binary files live
+bin_dir = '/usr/lib/airtime/show-recorder'
+
+# base path to store recordered shows at
+base_recorded_files = '/var/tmp/airtime/show-recorder/'
+
+# where the logging files live
+log_dir = '/var/log/airtime/show-recorder'
+
+############################################
+# RabbitMQ settings                        #
+############################################
+rabbitmq_host = 'localhost'
+rabbitmq_user = 'guest'
+rabbitmq_password = 'guest'
+
+############################################
+# Recorded Audio settings                  #
+############################################
+record_bitrate = 256
+record_samplerate = 44100
+record_channels = 2
+record_sample_size = 16
+

python_apps/api_clients/api_client.py

@@ -21,7 +21,7 @@ from urlparse import urlparse
 import base64
 from configobj import ConfigObj
 
-AIRTIME_VERSION = "1.9.1"
+AIRTIME_VERSION = "1.9.2"
 
 def api_client_factory(config):
     logger = logging.getLogger()