Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-2519: Remove stor folder config option from /etc/airtime/airtime.conf 

-done
This commit is contained in:
martin 2011-07-11 16:44:37 -04:00
parent 0c1f75f01e
commit 063afda7ff
9 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/configs/conf.php
View File

@ -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'];

1
airtime_mvc/build/airtime.conf
View File

@ -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

1
install/include/AirtimeIni.php
View File

@ -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'");

2
install/include/AirtimeInstall.php
View File

@ -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,

8
install/include/airtime-uninstall.php
View File

@ -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();

2
install/upgrades/airtime-1.8.1/airtime-upgrade.php
View File

@ -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'];

2
install/upgrades/airtime-1.8.2/airtime-upgrade.php
View File

@ -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'];

6
install/upgrades/airtime-1.8/airtime-upgrade.php
View File

@ -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();

2
utils/phone_home_stat.php
View File

@ -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'];