Merge branch 'master' of dev.sourcefabric.org:airtime into 1.8.1

Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
This commit is contained in:
martin 2011-04-26 15:34:53 -04:00
commit 9236f4941d
26 changed files with 494 additions and 275 deletions

View file

@ -8,6 +8,7 @@ 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";
public static function GetAirtimeSrcDir()
{
@ -321,4 +322,28 @@ class AirtimeInstall
}
}
}
public static function CreateZendPhpLogFile(){
global $CC_CONFIG;
echo "* Creating logs directory ".AirtimeInstall::CONF_DIR_LOG.PHP_EOL;
$path = AirtimeInstall::CONF_DIR_LOG;
$file = $path.'/zendphp.log';
if (!file_exists($path)){
mkdir($path, 0755, true);
}
touch($file);
chmod($file, 0755);
chown($file, $CC_CONFIG['webServerUser']);
chgrp($file, $CC_CONFIG['webServerUser']);
}
public static function RemoveLogDirectories(){
$path = AirtimeInstall::CONF_DIR_LOG;
echo "* Removing logs directory ".$path.PHP_EOL;
exec("rm -rf $path");
}
}