-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"
This commit is contained in:
parent
4739fd3d18
commit
7e96572aee
6 changed files with 14 additions and 14 deletions
|
@ -12,9 +12,9 @@ resources.view[] =
|
|||
resources.db.adapter = "Pdo_Pgsql"
|
||||
resources.db.params.charset = "utf8"
|
||||
resources.db.params.host = "localhost"
|
||||
resources.db.params.username = "campcaster"
|
||||
resources.db.params.password = "campcaster"
|
||||
resources.db.params.dbname = "campcaster"
|
||||
resources.db.params.username = "airtime"
|
||||
resources.db.params.password = "airtime"
|
||||
resources.db.params.dbname = "airtime"
|
||||
|
||||
[staging : production]
|
||||
|
||||
|
|
|
@ -8,11 +8,11 @@ global $CC_CONFIG;
|
|||
$CC_CONFIG = array(
|
||||
// Database config
|
||||
'dsn' => array(
|
||||
'username' => 'campcaster',
|
||||
'password' => 'campcaster',
|
||||
'username' => 'airtime',
|
||||
'password' => 'airtime',
|
||||
'hostspec' => 'localhost',
|
||||
'phptype' => 'pgsql',
|
||||
'database' => 'campcaster',
|
||||
'database' => 'airtime',
|
||||
),
|
||||
|
||||
// Name of the web server user
|
||||
|
|
|
@ -9,7 +9,7 @@ $conf = array (
|
|||
'adapter' => 'pgsql',
|
||||
'connection' =>
|
||||
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',
|
||||
|
|
|
@ -3,7 +3,7 @@ project.build = ${project.home}/build
|
|||
|
||||
#Database driver
|
||||
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
|
||||
propel.project = campcaster
|
||||
|
|
|
@ -145,7 +145,7 @@
|
|||
}
|
||||
|
||||
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);
|
||||
}});
|
||||
setTimeout(getScheduleFromServer, 5000);
|
||||
|
|
|
@ -238,11 +238,11 @@ if ($DEBUG_IMPORT) {
|
|||
$testonly = false;
|
||||
$importMode = "link";
|
||||
$files = array("/path/to/your/test/file.mp3");
|
||||
$dsn = array('username' => 'campcaster',
|
||||
'password' => 'campcaster',
|
||||
$dsn = array('username' => 'airtime',
|
||||
'password' => 'airtime',
|
||||
'hostspec' => 'localhost',
|
||||
'phptype' => 'pgsql',
|
||||
'database' => 'campcaster');
|
||||
'database' => 'airtime');
|
||||
} else {
|
||||
$dsn = $CC_CONFIG['dsn'];
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue