From 2d11595a33901a7789f54fc22e21ce6180f9f41b Mon Sep 17 00:00:00 2001 From: "paul.baranowski" Date: Thu, 24 Mar 2011 16:44:23 -0400 Subject: [PATCH 1/6] CC-2100 Remove tables that are not in use Removed tables from the schema. --- build/schema.xml | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/build/schema.xml b/build/schema.xml index f00ad14fb..3bd235e09 100644 --- a/build/schema.xml +++ b/build/schema.xml @@ -24,13 +24,6 @@ - - - - - - -
@@ -295,45 +288,4 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
From bd54738c1b2e2b31039f783890d7e347ee5f7952 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 29 Mar 2011 12:53:52 -0400 Subject: [PATCH 2/6] CC-2104: Use PIP to install python packages -Done --- install/installInit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/installInit.php b/install/installInit.php index 1efaa4833..7e0ab2323 100644 --- a/install/installInit.php +++ b/install/installInit.php @@ -194,7 +194,7 @@ class AirtimeInstall { public static function SetUpPythonEggs() { //install poster streaming upload - $command = "sudo easy_install poster"; + $command = "pip install poster"; @exec($command); } From 0ad7a0afcdb5cd9ae8cd6d26efc50cf78366230a Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 29 Mar 2011 12:59:15 -0400 Subject: [PATCH 3/6] CC-2104: Use PIP to install python packages -Now uninstalls poster package. --- install/airtime-uninstall.php | 1 + install/installInit.php | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/install/airtime-uninstall.php b/install/airtime-uninstall.php index 5b9a58c3a..40a77b8bc 100644 --- a/install/airtime-uninstall.php +++ b/install/airtime-uninstall.php @@ -21,6 +21,7 @@ require_once(dirname(__FILE__).'/installInit.php'); AirtimeInstall::ExitIfNotRoot(); AirtimeInstall::RemoveSymlinks(); +AirtimeInstall::RemovePythonPackages(); echo "******************************* Uninstall Begin ********************************".PHP_EOL; //------------------------------------------------------------------------ diff --git a/install/installInit.php b/install/installInit.php index 7e0ab2323..bf263bf04 100644 --- a/install/installInit.php +++ b/install/installInit.php @@ -198,6 +198,11 @@ class AirtimeInstall { @exec($command); } + public static function RemovePythonPackages(){ + $command = "pip uninstall poster"; + @exec($command); + } + public static function DeleteFilesRecursive($p_path) { $command = "rm -rf $p_path"; From d66bcea044ebbb83ef20b2e0d9056d53af7fb735 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 29 Mar 2011 14:09:06 -0400 Subject: [PATCH 4/6] CC-2104: Use PIP to install python packages -removed pip install/uninstall from install scripts. Added to wiki instead. --- install/airtime-install.php | 3 --- install/airtime-uninstall.php | 1 - install/installInit.php | 12 ------------ 3 files changed, 16 deletions(-) diff --git a/install/airtime-install.php b/install/airtime-install.php index 1d350f1e1..a0428878c 100644 --- a/install/airtime-install.php +++ b/install/airtime-install.php @@ -52,9 +52,6 @@ AirtimeInstall::CreateSymlinks($CC_CONFIG["storageDir"]); echo "* Importing Sample Audio Clips".PHP_EOL; system(__DIR__."/../utils/airtime-import --copy ../audio_samples/ > /dev/null"); -echo "* Python eggs Setup".PHP_EOL; -AirtimeInstall::SetUpPythonEggs(); - echo PHP_EOL."*** Pypo Installation ***".PHP_EOL; system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py"); diff --git a/install/airtime-uninstall.php b/install/airtime-uninstall.php index 40a77b8bc..5b9a58c3a 100644 --- a/install/airtime-uninstall.php +++ b/install/airtime-uninstall.php @@ -21,7 +21,6 @@ require_once(dirname(__FILE__).'/installInit.php'); AirtimeInstall::ExitIfNotRoot(); AirtimeInstall::RemoveSymlinks(); -AirtimeInstall::RemovePythonPackages(); echo "******************************* Uninstall Begin ********************************".PHP_EOL; //------------------------------------------------------------------------ diff --git a/install/installInit.php b/install/installInit.php index bf263bf04..d720daaab 100644 --- a/install/installInit.php +++ b/install/installInit.php @@ -191,18 +191,6 @@ class AirtimeInstall { system($command); } - public static function SetUpPythonEggs() - { - //install poster streaming upload - $command = "pip install poster"; - @exec($command); - } - - public static function RemovePythonPackages(){ - $command = "pip uninstall poster"; - @exec($command); - } - public static function DeleteFilesRecursive($p_path) { $command = "rm -rf $p_path"; From e8b80d1e7bf4deb8b36fb0fcd0154ddccbefae64 Mon Sep 17 00:00:00 2001 From: "paul.baranowski" Date: Tue, 29 Mar 2011 14:10:18 -0400 Subject: [PATCH 5/6] Updated 3rd party software packages info. --- LICENSE_3RD_PARTY | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/LICENSE_3RD_PARTY b/LICENSE_3RD_PARTY index 892af37a1..06dcf9016 100644 --- a/LICENSE_3RD_PARTY +++ b/LICENSE_3RD_PARTY @@ -29,8 +29,19 @@ Linked code: - License: LGPLv3 * Soundcloud php api wrapper - - https://github.com/mptre/php-soundcloud/blob/master/Services/Soundcloud.php + - Web site: https://github.com/mptre/php-soundcloud/blob/master/Services/Soundcloud.php - License: MIT + - Compatible with the GPL: Yes. See http://www.gnu.org/licenses/license-list.html + + * Kombu + - Web site: http://pypi.python.org/pypi/kombu/ + - License: New BSD + - Compatible with GPLv3? Yes. + + * PHP-AMQPLIB + - Web site: https://github.com/tnc/php-amqplib + - License: LGPLv2.1 + - Compatible with GPLv3? Yes ---------------- Non-linked code: From b73e58551ff763a0e36e97972e14888cc57a4121 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 29 Mar 2011 14:44:51 -0400 Subject: [PATCH 6/6] CC-2128: storageUrlPort in application/configs/conf.php not being used -fixed --- application/configs/conf.php | 37 ------------------------------- application/models/StoredFile.php | 3 ++- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/application/configs/conf.php b/application/configs/conf.php index 74c3b10ac..b96db1f1d 100644 --- a/application/configs/conf.php +++ b/application/configs/conf.php @@ -61,38 +61,6 @@ $CC_CONFIG = array( 'zendPath' => dirname(__FILE__).'/../../library/Zend', 'phingPath' => dirname(__FILE__).'/../../library/phing', - // name of admin group - //'AdminsGr' => 'Admins', - - // name of station preferences group -// 'StationPrefsGr'=> 'StationPrefs', - - // name of 'all users' group - //'AllGr' => 'All', - - /* ==================================== application-specific configuration */ -// 'objtypes' => array( -// 'Storage' => array(/*'Folder',*/ 'File' /*, 'Replica'*/), -// 'File' => array(), -// 'audioclip' => array(), -// 'playlist' => array(), -// ), -// 'allowedActions'=> array( -// 'File' => array('editPrivs', 'write', 'read'), -// 'audioclip' => array('editPrivs', 'write', 'read'), -// 'playlist' => array('editPrivs', 'write', 'read'), -// ), -// 'allActions' => array( -// 'editPrivs', 'write', 'read', 'subjects' -// ), - - /* =================================================== cron configuration */ - 'cronUserName' => 'www-data', -# 'lockfile' => dirname(__FILE__).'/cron/cron.lock', - 'lockfile' => dirname(__FILE__).'/stor/buffer/cron.lock', - 'cronfile' => dirname(__FILE__).'/cron/croncall.php', - 'paramdir' => dirname(__FILE__).'/cron/params', -// 'systemPrefId' => "0", // ID for system prefs in prefs table ); // Add database table names @@ -119,11 +87,6 @@ $CC_CONFIG['permSequence'] = $CC_CONFIG['permTable'].'_id'; $CC_CONFIG['subjSequence'] = $CC_CONFIG['subjTable'].'_id'; $CC_CONFIG['smembSequence'] = $CC_CONFIG['smembTable'].'_id'; -// System users/groups - they cannot be deleted -//$CC_CONFIG['sysSubjs'] = array( -// 'root', /*$CC_CONFIG['AdminsGr'],*/ /*$CC_CONFIG['AllGr'],*/ $CC_CONFIG['StationPrefsGr'] -//); - // Add libs to the PHP path $old_include_path = get_include_path(); set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath'] diff --git a/application/models/StoredFile.php b/application/models/StoredFile.php index ecff91caa..cd98aff60 100644 --- a/application/models/StoredFile.php +++ b/application/models/StoredFile.php @@ -1481,7 +1481,8 @@ class StoredFile { public function getFileUrl() { global $CC_CONFIG; - return "http://".$CC_CONFIG["storageUrlHost"] + return "http://$CC_CONFIG[storageUrlHost]" + .":$CC_CONFIG[storageUrlPort]" .$CC_CONFIG["apiPath"]."get-media/file/" .$this->gunid.".".$this->getFileExtension(); }