From 6922c4d87c802d29cb2ffd7c1854735d9c4ea269 Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 22 Apr 2011 00:55:31 -0400 Subject: [PATCH] CC-2193: Debian database install fixes --- install/include/AirtimeInstall.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php index 00e9aae8e..35a7c5468 100644 --- a/install/include/AirtimeInstall.php +++ b/install/include/AirtimeInstall.php @@ -123,9 +123,9 @@ class AirtimeInstall echo "* Creating Airtime database user".PHP_EOL; - // Create the database user - $command = "sudo -u postgres psql postgres --command \"CREATE USER {$CC_CONFIG['dsn']['username']} " - ." ENCRYPTED PASSWORD '{$CC_CONFIG['dsn']['password']}' LOGIN CREATEDB NOCREATEUSER;\" 2>/dev/null"; + $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"; @exec($command, $output, $results); if ($results == 0) { @@ -147,7 +147,9 @@ class AirtimeInstall echo "* Creating Airtime database".PHP_EOL; - $command = "sudo -u postgres createdb {$CC_CONFIG['dsn']['database']} --owner {$CC_CONFIG['dsn']['username']} 2> /dev/null"; + $database = $CC_CONFIG['dsn']['database']; + $username = $CC_CONFIG['dsn']['username']; + $command = "echo \"CREATE DATABASE $database OWNER $username\" | sudo -u postgres psql"; @exec($command, $output, $results); if ($results == 0) { echo "* Database '{$CC_CONFIG['dsn']['database']}' created.".PHP_EOL;