[geeklog-cvs] geeklog-2 config.php,1.2,1.3

[tony at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-2
In directory internal.geeklog.net:/tmp/cvs-serv31617

Modified Files:
	config.php 
Log Message:
Added option for PEAR, added URL config's and set up better default values


Index: config.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-2/config.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.php	21 Oct 2002 04:13:47 -0000	1.2
--- config.php	11 Jan 2003 05:17:26 -0000	1.3
***************
*** 16,20 ****
  
  /**
! * @author Tony Bibbs <tony at tonybibbs.com>
  * @package net.geeklog.config
  */
--- 16,20 ----
  
  /**
! * @author Tony Bibbs <tony AT geeklog DOT com>
  * @package net.geeklog.config
  */
***************
*** 25,43 ****
  $_CONF['db_dbms']   = 'mysql';
  $_CONF['db_host']   = 'localhost';
! $_CONF['db_user']   = 'root';
! $_CONF['db_pass']   = '';
! $_CONF['db_name']   = 'geeklog_2';
  $_CONF['db_prefix'] = 'gl_';
  
  /**
  * Path settings
  */
! $_CONF['path']             = '/var/www/geeklog-2/';
  $_CONF['path_html']        = $_CONF['path'] . 'public_html/';
  $_CONF['path_admin']       = $_CONF['path_html'] . 'admin/';
  $_CONF['path_lib']         = $_CONF['path'] . 'lib/';
- $_CONF['path_pear']        = '/usr/share/pear/';
  $_CONF['path_logs']        = $_CONF['path'] . 'logs/';
  $_CONF['path_testscripts'] = $_CONF['path_html'] . 'testscripts/';
  
  /**
--- 25,60 ----
  $_CONF['db_dbms']   = 'mysql';
  $_CONF['db_host']   = 'localhost';
! $_CONF['db_user']   = 'username';
! $_CONF['db_pass']   = 'passowrd';
! $_CONF['db_name']   = 'geeklog2';
  $_CONF['db_prefix'] = 'gl_';
  
  /**
+ * Enterprise A&A Server Settings
+ */
+ $_CONF['AA_server'] = 'localhost';
+ $_CONF['AA_server_path'] = '/server/A_and_A/';
+ $_CONF['AA_appId'] = 'GEEKLOG';
+ $_CONF['AA_port'] = 80;
+ 
+ /**
  * Path settings
  */
! $_CONF['path']             = '/path/to/geeklog2/';
  $_CONF['path_html']        = $_CONF['path'] . 'public_html/';
  $_CONF['path_admin']       = $_CONF['path_html'] . 'admin/';
  $_CONF['path_lib']         = $_CONF['path'] . 'lib/';
  $_CONF['path_logs']        = $_CONF['path'] . 'logs/';
  $_CONF['path_testscripts'] = $_CONF['path_html'] . 'testscripts/';
+ 
+ $_CONF['site_url']         = 'http://www.example.com';
+ $_CONF['admin_url']        = $_CONF['site_url'] . '/admin';
+ 
+ // If your server already has a suitable PEAR installation *and* it
+ // is included in the include_path of the server then set this to true 
+ $_CONF['have_pear']        = true;
+ // If you set have_pear above to false then you need to set path_pear to 
+ // point to a directory that has PEAR installed
+ $_CONF['path_pear']        = '/path/to/pear/';
  
  /**