From 063afda7ff3a6f5cdf3e0093a8ce7910fc07c27e Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 11 Jul 2011 16:44:37 -0400 Subject: [PATCH] CC-2519: Remove stor folder config option from /etc/airtime/airtime.conf -done --- airtime_mvc/application/configs/conf.php | 2 -- airtime_mvc/build/airtime.conf | 1 - install/include/AirtimeIni.php | 1 - install/include/AirtimeInstall.php | 2 -- install/include/airtime-uninstall.php | 8 -------- install/upgrades/airtime-1.8.1/airtime-upgrade.php | 2 -- install/upgrades/airtime-1.8.2/airtime-upgrade.php | 2 -- install/upgrades/airtime-1.8/airtime-upgrade.php | 6 +++++- utils/phone_home_stat.php | 2 -- 9 files changed, 5 insertions(+), 21 deletions(-) diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php index 6829b7a85..51899021a 100644 --- a/airtime_mvc/application/configs/conf.php +++ b/airtime_mvc/application/configs/conf.php @@ -65,8 +65,6 @@ class Config { $CC_CONFIG['baseUrl'] = $values['general']['base_url']; $CC_CONFIG['basePort'] = $values['general']['base_port']; - - $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir']; // Database config $CC_CONFIG['dsn']['username'] = $values['database']['dbuser']; diff --git a/airtime_mvc/build/airtime.conf b/airtime_mvc/build/airtime.conf index 982d5a762..b11e672ce 100644 --- a/airtime_mvc/build/airtime.conf +++ b/airtime_mvc/build/airtime.conf @@ -15,7 +15,6 @@ vhost = / api_key = AAA web_server_user = www-data airtime_dir = x -base_files_dir = x base_url = localhost base_port = 80 diff --git a/install/include/AirtimeIni.php b/install/include/AirtimeIni.php index 559b7670f..99048cf05 100644 --- a/install/include/AirtimeIni.php +++ b/install/include/AirtimeIni.php @@ -196,7 +196,6 @@ class AirtimeIni { $api_key = AirtimeIni::GenerateRandomString(); AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_AIRTIME, 'api_key', $api_key); - AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_AIRTIME, 'base_files_dir', AirtimeInstall::CONF_DIR_STORAGE); AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_AIRTIME, 'airtime_dir', AirtimeInstall::CONF_DIR_WWW); AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_PYPO, 'api_key', "'$api_key'"); AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_RECORDER, 'api_key', "'$api_key'"); diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php index 4c4711f6a..8a9168f2a 100644 --- a/install/include/AirtimeInstall.php +++ b/install/include/AirtimeInstall.php @@ -6,7 +6,6 @@ require_once('DB.php'); class AirtimeInstall { const CONF_DIR_BINARIES = "/usr/lib/airtime"; - const CONF_DIR_STORAGE = "/srv/airtime"; const CONF_DIR_WWW = "/var/www/airtime"; const CONF_DIR_LOG = "/var/log/airtime"; @@ -361,7 +360,6 @@ class AirtimeInstall { echo "Legend: \"+\" means the dir/file exists, \"-\" means that it does not.".PHP_EOL; $dirs = array(AirtimeInstall::CONF_DIR_BINARIES, - AirtimeInstall::CONF_DIR_STORAGE, AirtimeInstall::CONF_DIR_WWW, AirtimeIni::CONF_FILE_AIRTIME, AirtimeIni::CONF_FILE_LIQUIDSOAP, diff --git a/install/include/airtime-uninstall.php b/install/include/airtime-uninstall.php index 361109c5b..39fc0af41 100644 --- a/install/include/airtime-uninstall.php +++ b/install/include/airtime-uninstall.php @@ -77,14 +77,6 @@ if ($results == 0) { echo " * Nothing to delete.".PHP_EOL; } -# Disabled as this should be a manual process -#AirtimeInstall::DeleteFilesRecursive(AirtimeInstall::CONF_DIR_STORAGE); - - - -#Disabled as this should be a manual process -#AirtimeIni::RemoveIniFiles(); - AirtimeInstall::RemoveSymlinks(); AirtimeInstall::UninstallBinaries(); AirtimeInstall::RemoveLogDirectories(); diff --git a/install/upgrades/airtime-1.8.1/airtime-upgrade.php b/install/upgrades/airtime-1.8.1/airtime-upgrade.php index 619e72c64..cec3769b8 100644 --- a/install/upgrades/airtime-1.8.1/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8.1/airtime-upgrade.php @@ -91,8 +91,6 @@ function LoadConfig($CC_CONFIG) { //$CC_CONFIG['baseUrl'] = $values['general']['base_url']; //$CC_CONFIG['basePort'] = $values['general']['base_port']; - $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir']; - // Database config $CC_CONFIG['dsn']['username'] = $values['database']['dbuser']; $CC_CONFIG['dsn']['password'] = $values['database']['dbpass']; diff --git a/install/upgrades/airtime-1.8.2/airtime-upgrade.php b/install/upgrades/airtime-1.8.2/airtime-upgrade.php index 6ebe4d39f..a5ae869c6 100644 --- a/install/upgrades/airtime-1.8.2/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8.2/airtime-upgrade.php @@ -91,8 +91,6 @@ function LoadConfig($CC_CONFIG) { $CC_CONFIG['baseUrl'] = $values['general']['base_url']; $CC_CONFIG['basePort'] = $values['general']['base_port']; - $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir']; - // Database config $CC_CONFIG['dsn']['username'] = $values['database']['dbuser']; $CC_CONFIG['dsn']['password'] = $values['database']['dbpass']; diff --git a/install/upgrades/airtime-1.8/airtime-upgrade.php b/install/upgrades/airtime-1.8/airtime-upgrade.php index c6fdc9ba6..55ea0272b 100644 --- a/install/upgrades/airtime-1.8/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8/airtime-upgrade.php @@ -66,5 +66,9 @@ $CC_CONFIG = Config::loadConfig($CC_CONFIG); echo "* Creating default storage directory".PHP_EOL; AirtimeInstall::InstallStorageDirectory(); -AirtimeInstall::ChangeDirOwnerToWebserver($CC_CONFIG['baseFilesDir']."/stor"); + +$ini = parse_ini_file(__DIR__."/../../include/airtime-install.ini"); +$stor_dir = $ini["storage_dir"]; + +AirtimeInstall::ChangeDirOwnerToWebserver($stor_dir); AirtimeInstall::CreateSymlinksToUtils(); diff --git a/utils/phone_home_stat.php b/utils/phone_home_stat.php index 89b3df90a..543779b70 100644 --- a/utils/phone_home_stat.php +++ b/utils/phone_home_stat.php @@ -10,8 +10,6 @@ $CC_CONFIG['rabbitmq'] = $values['rabbitmq']; $CC_CONFIG['baseUrl'] = $values['general']['base_url']; $CC_CONFIG['basePort'] = $values['general']['base_port']; -$CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir']; - // Database config $CC_CONFIG['dsn']['username'] = $values['database']['dbuser']; $CC_CONFIG['dsn']['password'] = $values['database']['dbpass'];