[geeklog-cvs] geeklog-1.3 config.php,1.96,1.97

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3
In directory geeklog_prod:/tmp/cvs-serv3292

Modified Files:
	config.php 
Log Message:
Geeklog now uses PEAR::Mail to send emails.


Index: config.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/config.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** config.php	31 Aug 2003 08:18:01 -0000	1.96
--- config.php	4 Sep 2003 09:50:15 -0000	1.97
***************
*** 36,44 ****
  // $Id$
  
! // When setting up Geeklog for the first time, you only need to make sure the
! // settings in the following 3 sections are correct:
  // (1) Database Settings
  // (2) Paths
  // (3) Site Settings
  // You can adjust the other settings once your site is up and running.
  
--- 36,46 ----
  // $Id$
  
! // When setting up Geeklog for the first time, you need to make sure the
! // settings in the following 5 sections are correct:
  // (1) Database Settings
  // (2) Paths
  // (3) Site Settings
+ // (4) PEAR Settings
+ // (5) Email Settings
  // You can adjust the other settings once your site is up and running.
  
***************
*** 92,98 ****
--- 94,142 ----
  $_CONF['site_mail']         = 'admin at example.com';
  
+ // Name and slogan of your site
  $_CONF['site_name']         = 'Geeklog Site';
  $_CONF['site_slogan']       = 'Another Nifty Geeklog Site';
  
+ 
+ // +---------------------------------------------------------------------------+
+ // | (4) PEAR Settings                                                         |
+ // +---------------------------------------------------------------------------+
+ 
+ // If your server is running PHP 4.3.0 (or newer) then chances are that PEAR
+ // is already installed and you can leave this as "true".
+ $_CONF['have_pear'] = true;
+ 
+ // Geeklog comes with the necessary PEAR packages, so if you don't have PEAR
+ // installed, set $_CONF['have_pear'] = false (above). The following path
+ // points to those packages (leave as is unless you know what your're doing).
+ $_CONF['path_pear'] = $_CONF['path_system'] . 'pear/';
+ 
+ 
+ // +---------------------------------------------------------------------------+
+ // | (5) Email Settings                                                        |
+ // +---------------------------------------------------------------------------+
+ 
+ // To send email from Geeklog, you will need to select one of the following
+ // email backends:
+ // - 'mail', i.e. use PHP's built-in mail() function
+ // - 'sendmail', i.e. use the sendmail utility
+ // - 'smtp', i.e. talk directly to your SMTP server
+ 
+ $_CONF['mail_settings'] = array (  
+     'backend' => 'mail', // can be one of 'mail', 'sendmail', 'smtp'
+ 
+     // sendmail parameters
+     'sendmail_path' => '/usr/bin/sendmail',
+     'sendmail_args' => '',
+ 
+     // SMTP parameters
+     'host'     => 'smtp.example.com',
+     'port'     => '25',
+     'auth'     => false,
+     'username' => 'smtp-username',
+     'password' => 'smtp-password'
+ );
+ 
+ 
  // ****************************************************************************
  // * If you set up Geeklog for the first time, you shouldn't need to change   *
***************
*** 245,249 ****
  // 0: use users max stories per page
  // 1: Show all
! // any other number is the # of resuilts per page
  $_CONF['max_search_results']  =  1;
      
--- 289,293 ----
  // 0: use users max stories per page
  // 1: Show all
! // any other number is the # of results per page
  $_CONF['max_search_results']  =  1;