From 2c7bf676a317d98b17e7618fc0b9810542960e80 Mon Sep 17 00:00:00 2001 From: Naomi Date: Mon, 18 Apr 2011 14:42:41 -0400 Subject: [PATCH 1/3] creating default storage directory in airtime --- install/airtime-install.php | 2 +- install/include/AirtimeInstall.php | 2 +- install/upgrades/airtime-1.8/airtime-upgrade.php | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/install/airtime-install.php b/install/airtime-install.php index d3cf37f68..787ff629c 100644 --- a/install/airtime-install.php +++ b/install/airtime-install.php @@ -80,7 +80,7 @@ AirtimeInstall::InstallPostgresScriptingLanguage(); AirtimeInstall::CreateDatabaseTables(); -AirtimeInstall::InstallStorageDirectory($CC_CONFIG); +AirtimeInstall::InstallStorageDirectory(); AirtimeInstall::ChangeDirOwnerToWebserver($CC_CONFIG["storageDir"]); diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php index 23fee89c4..00e9aae8e 100644 --- a/install/include/AirtimeInstall.php +++ b/install/include/AirtimeInstall.php @@ -91,7 +91,7 @@ class AirtimeInstall chmod($filePath, $fileperms); } - public static function InstallStorageDirectory($CC_CONFIG) + public static function InstallStorageDirectory() { global $CC_CONFIG, $CC_DBC; echo "* Storage directory setup".PHP_EOL; diff --git a/install/upgrades/airtime-1.8/airtime-upgrade.php b/install/upgrades/airtime-1.8/airtime-upgrade.php index 1287a2f81..d9e75f457 100644 --- a/install/upgrades/airtime-1.8/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8/airtime-upgrade.php @@ -61,3 +61,6 @@ AirtimeInstall::InstallBinaries(); echo "* Initializing INI files".PHP_EOL; AirtimeIni::UpdateIniFiles(); + +echo "* Creating default storage directory".PHP_EOL; +AirtimeInstall::InstallStorageDirectory(); From 9e96ec9da4ea1837e2487817660e6c0f34d28001 Mon Sep 17 00:00:00 2001 From: Naomi Date: Mon, 18 Apr 2011 15:28:48 -0400 Subject: [PATCH 2/3] reloading config after ini values are changed --- airtime_mvc/application/configs/conf.php | 26 +++++++++++++++++++ install/airtime-install.php | 2 +- install/include/AirtimeIni.php | 3 +-- .../upgrades/airtime-1.8/airtime-upgrade.php | 3 +++ 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php index 8dba78a5d..429edb3cf 100644 --- a/airtime_mvc/application/configs/conf.php +++ b/airtime_mvc/application/configs/conf.php @@ -86,4 +86,30 @@ set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath'] function load_airtime_config(){ $ini_array = parse_ini_file('/etc/airtime/airtime.conf', true); return $ini_array; +} + +class Config { + public static function reload_config() { + global $CC_CONFIG; + $values = parse_ini_file('/etc/airtime/airtime.conf', true); + + // Name of the web server user + $CC_CONFIG['webServerUser'] = $values['general']['web_server_user']; + $CC_CONFIG['rabbitmq'] = $values['rabbitmq']; + + $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir']; + // main directory for storing binary media files + $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor"; + + // Database config + $CC_CONFIG['dsn']['username'] = $values['database']['dbuser']; + $CC_CONFIG['dsn']['password'] = $values['database']['dbpass']; + $CC_CONFIG['dsn']['hostspec'] = $values['database']['host']; + $CC_CONFIG['dsn']['database'] = $values['database']['dbname']; + + $CC_CONFIG['apiKey'] = array($values['general']['api_key']); + + $CC_CONFIG['soundcloud-connection-retries'] = $values['soundcloud']['connection_retries']; + $CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_retries']; + } } diff --git a/install/airtime-install.php b/install/airtime-install.php index 787ff629c..9ac7e6b78 100644 --- a/install/airtime-install.php +++ b/install/airtime-install.php @@ -84,7 +84,7 @@ AirtimeInstall::InstallStorageDirectory(); AirtimeInstall::ChangeDirOwnerToWebserver($CC_CONFIG["storageDir"]); -AirtimeInstall::CreateSymlinksToUtils($CC_CONFIG["storageDir"]); +AirtimeInstall::CreateSymlinksToUtils(); echo PHP_EOL."*** Pypo Installation ***".PHP_EOL; system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py"); diff --git a/install/include/AirtimeIni.php b/install/include/AirtimeIni.php index 27384fead..930b6260d 100644 --- a/install/include/AirtimeIni.php +++ b/install/include/AirtimeIni.php @@ -1,7 +1,6 @@ Date: Mon, 18 Apr 2011 15:41:11 -0400 Subject: [PATCH 3/3] better message about backing up. --- install/upgrades/airtime-1.8/airtime-upgrade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/upgrades/airtime-1.8/airtime-upgrade.php b/install/upgrades/airtime-1.8/airtime-upgrade.php index bcc1a2a75..a961bdbe5 100644 --- a/install/upgrades/airtime-1.8/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8/airtime-upgrade.php @@ -48,7 +48,7 @@ $configFiles = array(AirtimeIni::CONF_FILE_AIRTIME, foreach ($configFiles as $conf) { if (file_exists($conf)) { - echo "Backing up $conf".PHP_EOL; + echo "Backing up $conf to $conf.bak".PHP_EOL; exec("cp $conf $conf.bak"); } }