OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

developer system settings

Browse Source
This commit is contained in:
following
2012-08-10 11:08:38 +02:00
parent a37bb38e68
commit f6013cbc8a
3 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/dbupdate.php
+2 -2
View File
@@ -6,11 +6,11 @@
* Tables must be updated manually, see htdocs/doc/sql/db-changes.txt * Tables must be updated manually, see htdocs/doc/sql/db-changes.txt
*/ */
require('htdocs/util/mysql_root/settings.inc.php'); require('htdocs/lib/settings.inc.php');
echo "importing data.sql ...\n"; echo "importing data.sql ...\n";
chdir ('htdocs/doc/sql'); chdir ('htdocs/doc/sql');
system('cat static-data/data.sql | mysql -uroot --password=' . $db_root_password . ' opencaching'); system('cat static-data/data.sql | mysql -u' . $dbusername . ' --password=' . $dbpasswd . ' ' . $dbname);
echo "importing triggers ...\n"; echo "importing triggers ...\n";
chdir('stored-proc'); chdir('stored-proc');
htdocs/config2/settings-dev.inc.php
-14
View File
@@ -38,11 +38,6 @@
/* settings for the template engine /* settings for the template engine
* *
*/ */
$opt['db']['servername'] = ':/var/lib/mysql/mysql.sock';
$opt['db']['username'] = 'oc';
$opt['db']['password'] = 'developer';
$opt['db']['pconnect'] = true;
// ... how long a query can take without warning (0 <= disabled) // ... how long a query can take without warning (0 <= disabled)
$opt['db']['warn']['time'] = 0; $opt['db']['warn']['time'] = 0;
$opt['db']['warn']['mail'] = 'root'; $opt['db']['warn']['mail'] = 'root';
@@ -53,11 +48,6 @@
$opt['db']['error']['mail'] = 'root'; $opt['db']['error']['mail'] = 'root';
$opt['db']['error']['subject'] = 'sql_error'; $opt['db']['error']['subject'] = 'sql_error';
// database placeholder
$opt['db']['placeholder']['db'] = 'opencaching';
$opt['db']['placeholder']['tmpdb'] = 'octmp';
$opt['db']['placeholder']['hist'] = 'ochist';
/* cookie or session /* cookie or session
* *
* SAVE_COOKIE = only use cookies * SAVE_COOKIE = only use cookies
@@ -131,9 +121,6 @@
$opt['template']['default']['style'] = 'ocstyle'; $opt['template']['default']['style'] = 'ocstyle';
// Google maps key
$opt['lib']['google']['mapkey']['local.opencaching.de'] = 'ABQIAAAAwY6rAeeTA2cLnBDnf5FWGhQ9ZMVXtHZ4yn114tr66PefbkFZhBQXKkJK_k96Ci1JimzyaUwfhFhGrQ';
$opt['bin']['cs2cs'] = '/var/www/bin/cs2cs'; $opt['bin']['cs2cs'] = '/var/www/bin/cs2cs';
// Flag paths // Flag paths
@@ -152,6 +139,5 @@
$opt['template']['locales']['DA']['show'] = false; $opt['template']['locales']['DA']['show'] = false;
$opt['template']['locales']['PT']['show'] = false; $opt['template']['locales']['PT']['show'] = false;
$opt['template']['locales']['JA']['show'] = false; $opt['template']['locales']['JA']['show'] = false;
?> ?>
htdocs/lib/settings-dev.inc.php
+1 -10
View File
@@ -78,19 +78,10 @@
// news settings // news settings
$use_news_approving = true; $use_news_approving = true;
$news_approver_email = 'news-approver@devel.opencaching.de'; $news_approver_email = 'root';
$opt['page']['showdonations'] = false; $opt['page']['showdonations'] = false;
//local database settings
$dbusername = 'ocold';
$dbname = 'opencaching';
$dbserver = ':/var/lib/mysql/mysql.sock';
$dbpasswd = 'developer';
$dbpconnect = false;
$tmpdbname = 'test'; // empty db with CREATE and DROP priviledges
// date format // date format
$opt['db']['dateformat'] = 'Y-m-d H:i:s'; $opt['db']['dateformat'] = 'Y-m-d H:i:s';