Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

-updated to use new database name, login and passwd (all 3 are "airtime"). You may delete old database by typing "dropdb -U campcaster -h localhost campcaster"

Browse source
This commit is contained in:
mkonecny 2011-01-05 19:05:57 -05:00
parent 4739fd3d18
commit 7e96572aee
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
application/configs/application.ini
View file

@ -12,9 +12,9 @@ resources.view[] =
resources.db.adapter = "Pdo_Pgsql" resources.db.adapter = "Pdo_Pgsql"
resources.db.params.charset = "utf8" resources.db.params.charset = "utf8"
resources.db.params.host = "localhost" resources.db.params.host = "localhost"
resources.db.params.username = "campcaster" resources.db.params.username = "airtime"
resources.db.params.password = "campcaster" resources.db.params.password = "airtime"
resources.db.params.dbname = "campcaster" resources.db.params.dbname = "airtime"
[staging : production] [staging : production]

6
application/configs/conf.php
View file

@ -8,11 +8,11 @@ global $CC_CONFIG;
$CC_CONFIG = array( $CC_CONFIG = array(
// Database config // Database config
'dsn' => array( 'dsn' => array(
'username' => 'campcaster', 'username' => 'airtime',
'password' => 'campcaster', 'password' => 'airtime',
'hostspec' => 'localhost', 'hostspec' => 'localhost',
'phptype' => 'pgsql', 'phptype' => 'pgsql',
'database' => 'campcaster', 'database' => 'airtime',
), ),
// Name of the web server user // Name of the web server user

2
application/configs/propel-config.php
View file

@ -9,7 +9,7 @@ $conf = array (
'adapter' => 'pgsql', 'adapter' => 'pgsql',
'connection' => 'connection' =>
array ( array (
'dsn' => 'pgsql:host=localhost;port=5432;dbname=campcaster;user=campcaster;password=campcaster', 'dsn' => 'pgsql:host=localhost;port=5432;dbname=airtime;user=airtime;password=airtime',
), ),
), ),
'default' => 'campcaster', 'default' => 'campcaster',

2
build/build.properties
View file

@ -3,7 +3,7 @@ project.build = ${project.home}/build
#Database driver #Database driver
propel.database = pgsql propel.database = pgsql
propel.database.url = pgsql:host=localhost dbname=campcaster user=campcaster password=campcaster propel.database.url = pgsql:host=localhost dbname=airtime user=airtime password=airtime
#Project name #Project name
propel.project = campcaster propel.project = campcaster

2
public/js/playlist/playlist.js
View file

@ -145,7 +145,7 @@
} }
function getScheduleFromServer(){ function getScheduleFromServer(){
$.ajax({ url: "http://localhost/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){ $.ajax({ url: "/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){
parseItems(data.entries); parseItems(data.entries);
}}); }});
setTimeout(getScheduleFromServer, 5000); setTimeout(getScheduleFromServer, 5000);

6
utils/airtime-import.php
View file

@ -238,11 +238,11 @@ if ($DEBUG_IMPORT) {
$testonly = false; $testonly = false;
$importMode = "link"; $importMode = "link";
$files = array("/path/to/your/test/file.mp3"); $files = array("/path/to/your/test/file.mp3");
$dsn = array('username' => 'campcaster', $dsn = array('username' => 'airtime',
'password' => 'campcaster', 'password' => 'airtime',
'hostspec' => 'localhost', 'hostspec' => 'localhost',
'phptype' => 'pgsql', 'phptype' => 'pgsql',
'database' => 'campcaster'); 'database' => 'airtime');
} else { } else {
$dsn = $CC_CONFIG['dsn']; $dsn = $CC_CONFIG['dsn'];
} }