From e7e0afbfe7630c5c2e4c8975d1bd5ccb1eaf535b Mon Sep 17 00:00:00 2001 From: Robert Chipperfield Date: Mon, 10 Dec 2012 16:33:02 +0000 Subject: [PATCH] Copy config files to sample versions and ignore them from git so upgrades don't overwrite them --- .gitignore | 2 ++ application/config/{config.php => config.sample.php} | 6 +++--- application/config/{database.php => database.sample.php} | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 .gitignore rename application/config/{config.php => config.sample.php} (99%) rename application/config/{database.php => database.sample.php} (98%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..92a4fa38 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/application/config/database.php +/application/config/config.php diff --git a/application/config/config.php b/application/config/config.sample.php similarity index 99% rename from application/config/config.php rename to application/config/config.sample.php index 26613fd1..b0be7d88 100644 --- a/application/config/config.php +++ b/application/config/config.sample.php @@ -28,9 +28,9 @@ $config['callbook'] = "qrz"; // Options are hamio or qrz | 'display_freq' Show or Hide frequnecy info */ -$config['table_name'] = "table_hrd_contacts_v01"; -$config['locator'] = "IO91JS"; -$config['display_freq'] = false; +$config['table_name'] = "TABLE_HRD_CONTACTS_V01"; +$config['locator'] = ""; +$config['display_freq'] = true; /* |-------------------------------------------------------------------------- diff --git a/application/config/database.php b/application/config/database.sample.php similarity index 98% rename from application/config/database.php rename to application/config/database.sample.php index 8a646908..a30cee4f 100644 --- a/application/config/database.php +++ b/application/config/database.sample.php @@ -37,7 +37,7 @@ // The following values will probably need to be changed. $db['default']['username'] = "root"; $db['default']['password'] = ""; -$db['default']['database'] = "2e0sql_log"; +$db['default']['database'] = "log"; // The following values can probably stay the same. $db['default']['hostname'] = "localhost";