diff --git a/airtime_mvc/application/configs/application.ini b/airtime_mvc/application/configs/application.ini index 71bcd5c46..a9302c71d 100644 --- a/airtime_mvc/application/configs/application.ini +++ b/airtime_mvc/application/configs/application.ini @@ -12,12 +12,13 @@ resources.frontController.plugins.putHandler = "Zend_Controller_Plugin_PutHandle resources.modules[] = "" resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts/" resources.view[] = -resources.db.adapter = "Pdo_Pgsql" -resources.db.params.charset = "utf8" -resources.db.params.host = "localhost" -resources.db.params.username = "airtime" -resources.db.params.password = "airtime" -resources.db.params.dbname = "airtime" +; These are no longer needed. They are specified in /etc/airtime/airtime.conf: +;resources.db.adapter = "Pdo_Pgsql" +;resources.db.params.charset = "utf8" +;resources.db.params.host = "localhost" +;resources.db.params.username = "airtime" +;resources.db.params.password = "airtime" +;resources.db.params.dbname = "airtime" [staging : production] diff --git a/airtime_mvc/application/models/Auth.php b/airtime_mvc/application/models/Auth.php index 104ee8050..ee539c7c1 100644 --- a/airtime_mvc/application/models/Auth.php +++ b/airtime_mvc/application/models/Auth.php @@ -74,8 +74,17 @@ class Application_Model_Auth */ public static function getAuthAdapter() { - $dbAdapter = Zend_Db_Table::getDefaultAdapter(); - $authAdapter = new Zend_Auth_Adapter_DbTable($dbAdapter); + $CC_CONFIG = Config::getConfig(); + + // Database config + $db = Zend_Db::factory('PDO_' . $CC_CONFIG['dsn']['phptype'], array( + 'host' => $CC_CONFIG['dsn']['hostspec'], + 'username' => $CC_CONFIG['dsn']['username'], + 'password' => $CC_CONFIG['dsn']['password'], + 'dbname' => $CC_CONFIG['dsn']['database'] + )); + Zend_Db_Table_Abstract::setDefaultAdapter($db); + $authAdapter = new Zend_Auth_Adapter_DbTable($db); $authAdapter->setTableName('cc_subjs') ->setIdentityColumn('login') diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php index fd37edb22..dd97f0717 100644 --- a/install_minimal/include/AirtimeInstall.php +++ b/install_minimal/include/AirtimeInstall.php @@ -340,10 +340,6 @@ class AirtimeInstall $dir = AirtimeInstall::CONF_DIR_BINARIES."/utils/airtime-import/airtime-import"; exec("ln -s $dir /usr/bin/airtime-import"); - echo "* Installing airtime-update-db-settings".PHP_EOL; - $dir = AirtimeInstall::CONF_DIR_BINARIES."/utils/airtime-update-db-settings"; - exec("ln -s $dir /usr/bin/airtime-update-db-settings"); - echo "* Installing airtime-check-system".PHP_EOL; $dir = AirtimeInstall::CONF_DIR_BINARIES."/utils/airtime-check-system"; exec("ln -s $dir /usr/bin/airtime-check-system"); @@ -360,7 +356,6 @@ class AirtimeInstall public static function RemoveSymlinks() { exec("rm -f /usr/bin/airtime-import"); - exec("rm -f /usr/bin/airtime-update-db-settings"); exec("rm -f /usr/bin/airtime-check-system"); exec("rm -f /usr/bin/airtime-user"); exec("rm -f /usr/bin/airtime-log"); diff --git a/install_minimal/include/airtime-copy-files.sh b/install_minimal/include/airtime-copy-files.sh index 8f26b7d3f..ac3bff3c9 100755 --- a/install_minimal/include/airtime-copy-files.sh +++ b/install_minimal/include/airtime-copy-files.sh @@ -80,7 +80,6 @@ cp -R $AIRTIMEROOT/python_apps/std_err_override /usr/lib/airtime echo "* Creating symbolic links in /usr/bin" #create symbolic links ln -sf /usr/lib/airtime/utils/airtime-import/airtime-import /usr/bin/airtime-import -ln -sf /usr/lib/airtime/utils/airtime-update-db-settings /usr/bin/airtime-update-db-settings ln -sf /usr/lib/airtime/utils/airtime-check-system /usr/bin/airtime-check-system ln -sf /usr/lib/airtime/utils/airtime-log /usr/bin/airtime-log ln -sf /usr/lib/airtime/utils/airtime-test-soundcard /usr/bin/airtime-test-soundcard diff --git a/install_minimal/include/airtime-remove-files.sh b/install_minimal/include/airtime-remove-files.sh index 2429c17f4..3cafa6cbb 100755 --- a/install_minimal/include/airtime-remove-files.sh +++ b/install_minimal/include/airtime-remove-files.sh @@ -31,7 +31,6 @@ python $AIRTIMEROOT/python_apps/media-monitor/install/media-monitor-remove-files #remove symlinks rm -f /usr/bin/airtime-import -rm -f /usr/bin/airtime-update-db-settings rm -f /usr/bin/airtime-check-system rm -f /usr/bin/airtime-log rm -f /usr/bin/airtime-test-soundcard diff --git a/utils/airtime-update-db-settings b/utils/airtime-update-db-settings deleted file mode 100755 index 5ed0fcd89..000000000 --- a/utils/airtime-update-db-settings +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -#------------------------------------------------------------------------------- -# Determine directories, files -#------------------------------------------------------------------------------- - -virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" -. ${virtualenv_bin}activate - -# Absolute path to this script -SCRIPT=`readlink -f $0` -# Absolute directory this script is in -SCRIPTPATH=`dirname $SCRIPT` - -#------------------------------------------------------------------------------- -# Do import -#------------------------------------------------------------------------------- -invokePwd=$PWD -cd $SCRIPTPATH && python airtime-update-db-settings.py diff --git a/utils/airtime-update-db-settings.py b/utils/airtime-update-db-settings.py deleted file mode 100644 index d28322fb1..000000000 --- a/utils/airtime-update-db-settings.py +++ /dev/null @@ -1,87 +0,0 @@ -""" -The purpose of this script is to consolidate into one location where -we need to update database host, dbname, username and password. - -This script reads from /etc/airtime/airtime.conf. -""" -import os -import sys -import ConfigParser -import xml.dom.minidom -from xml.dom.minidom import Node - -if os.geteuid() != 0: - print "Please run this as root." - sys.exit(1) - -airtime_conf = '/etc/airtime/airtime.conf' - -#Read the universal values -parser = ConfigParser.SafeConfigParser() -parser.read(airtime_conf) - -host = 'resources.db.params.host' -dbname = 'resources.db.params.dbname' -username = 'resources.db.params.username' -password = 'resources.db.params.password' - -airtime_dir = parser.get('general', 'airtime_dir') -if os.path.exists(airtime_dir): - print 'Airtime root folder found at %s' % airtime_dir -else: - print 'Could not find Airtime root folder specified by "airtime_dir" in %s' % airtime_conf - sys.exit(1) - -print ("Updating %s/application/configs/application.ini" % airtime_dir) -f = file('%s/application/configs/application.ini' % airtime_dir,'r') -file_lines = [] - -for line in f: - if line[0:len(host)] == host: - line= '%s = "%s"\n' % (host, parser.get('database', 'host')) - elif line[0:len(dbname)] == dbname: - line= '%s = "%s"\n' % (dbname, parser.get('database', 'dbname')) - elif line[0:len(username)] == username: - line= '%s = "%s"\n' % (username, parser.get('database', 'dbuser')) - elif line[0:len(password)] == password: - line= '%s = "%s"\n' % (password, parser.get('database', 'dbpass')) - file_lines.append(line) -f.close() - -f = file('%s/application/configs/application.ini' % airtime_dir, 'w') -f.writelines(file_lines) -f.close() - - -print ("Updating %s/build/build.properties" % airtime_dir) - -f = file('%s/build/build.properties' % airtime_dir, 'r') -file_lines = [] - -db_url = 'propel.database.url' - -for line in f: - if line[0:len(db_url)] == db_url: - line = '%s = pgsql:host=%s dbname=%s user=%s password=%s\n' % \ - (db_url, parser.get('database', 'host'), parser.get('database', 'dbname'), parser.get('database', 'dbuser'), \ - parser.get('database', 'dbpass')) - file_lines.append(line) -f.close() - -f = file('%s/build/build.properties' % airtime_dir, 'w') -f.writelines(file_lines) -f.close() - -print ("Updating %s/build/runtime-conf.xml" % airtime_dir) - -doc = xml.dom.minidom.parse('%s/build/runtime-conf.xml' % airtime_dir) - -node = doc.getElementsByTagName("dsn")[0] -node.firstChild.nodeValue = 'pgsql:host=%s;port=5432;dbname=%s;user=%s;password=%s' % (parser.get('database', 'host'), \ -parser.get('database', 'dbname'), parser.get('database', 'dbuser'), parser.get('database', 'dbpass')) - -xml_file = open('%s/build/runtime-conf.xml' % airtime_dir, "w") -xml_file.writelines(doc.toxml('utf-8')) -xml_file.close() - -print "Success!"