From 2fb289bf0a0eb170dab56c702d0c3a036f83d29d Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 22 Apr 2011 23:02:18 -0400 Subject: [PATCH] cc-2193: debian database install fixes -fixed --- install/include/AirtimeInstall.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php index 35a7c5468..ef9b86af5 100644 --- a/install/include/AirtimeInstall.php +++ b/install/include/AirtimeInstall.php @@ -8,7 +8,7 @@ class AirtimeInstall const CONF_DIR_BINARIES = "/usr/lib/airtime"; const CONF_DIR_STORAGE = "/srv/airtime"; const CONF_DIR_WWW = "/var/www/airtime"; - + public static function GetAirtimeSrcDir() { return __DIR__."/../../airtime_mvc"; @@ -125,7 +125,7 @@ class AirtimeInstall $username = $CC_CONFIG['dsn']['username']; $password = $CC_CONFIG['dsn']['password']; - $command = "echo \"CREATE USER $username ENCRYPTED PASSWORD '$password' LOGIN CREATEDB NOCREATEUSER;\" | sudo -u postgres psql"; + $command = "echo \"CREATE USER $username ENCRYPTED PASSWORD '$password' LOGIN CREATEDB NOCREATEUSER;\" | su postgres -c psql"; @exec($command, $output, $results); if ($results == 0) { @@ -149,7 +149,7 @@ class AirtimeInstall $database = $CC_CONFIG['dsn']['database']; $username = $CC_CONFIG['dsn']['username']; - $command = "echo \"CREATE DATABASE $database OWNER $username\" | sudo -u postgres psql"; + $command = "echo \"CREATE DATABASE $database OWNER $username\" | su postgres -c psql"; @exec($command, $output, $results); if ($results == 0) { echo "* Database '{$CC_CONFIG['dsn']['database']}' created.".PHP_EOL;