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

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

Conflicts:
	install/include/AirtimeInstall.php
This commit is contained in:
martin 2011-04-25 15:23:21 -04:00
parent 2fb289bf0a 42a5df0b57
commit b030ebaba7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install/include/AirtimeInstall.php
View File

@ -8,7 +8,7 @@ class AirtimeInstall
const CONF_DIR_BINARIES = "/usr/lib/airtime"; const CONF_DIR_BINARIES = "/usr/lib/airtime";
const CONF_DIR_STORAGE = "/srv/airtime"; const CONF_DIR_STORAGE = "/srv/airtime";
const CONF_DIR_WWW = "/var/www/airtime"; const CONF_DIR_WWW = "/var/www/airtime";
public static function GetAirtimeSrcDir() public static function GetAirtimeSrcDir()
{ {
return __DIR__."/../../airtime_mvc"; return __DIR__."/../../airtime_mvc";
@ -150,6 +150,7 @@ class AirtimeInstall
$database = $CC_CONFIG['dsn']['database']; $database = $CC_CONFIG['dsn']['database'];
$username = $CC_CONFIG['dsn']['username']; $username = $CC_CONFIG['dsn']['username'];
$command = "echo \"CREATE DATABASE $database OWNER $username\" | su postgres -c psql"; $command = "echo \"CREATE DATABASE $database OWNER $username\" | su postgres -c psql";
@exec($command, $output, $results); @exec($command, $output, $results);
if ($results == 0) { if ($results == 0) {
echo "* Database '{$CC_CONFIG['dsn']['database']}' created.".PHP_EOL; echo "* Database '{$CC_CONFIG['dsn']['database']}' created.".PHP_EOL;