#! /bin/sh /usr/share/dpatch/dpatch-run
## modify-default-config by  <debian@mattb.net.nz>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Makes Debian specific changes to the default config shipped with
## DP: PHPwiki

@DPATCH@

--- phpwiki-1.3.12p3.orig/config/config-default.ini
+++ phpwiki-1.3.12p3/config/config-default.ini
@@ -161,9 +161,10 @@
 ; USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
 BABYCART_PATH = /usr/local/bin/babycart
 ; GRAPHVIZ_EXE = /usr/local/bin/dot
+ENABLE_SPAMBLOCKLIST = false
 
 PLUGIN_CACHED_DATABASE = file
-; PLUGIN_CACHED_CACHE_DIR = /tmp/cache
+PLUGIN_CACHED_CACHE_DIR = /var/cache/phpwiki
 PLUGIN_CACHED_FILENAME_PREFIX = phpwiki
 PLUGIN_CACHED_HIGHWATER = 4194304
 PLUGIN_CACHED_LOWWATER  = 3145728
--- phpwiki-1.3.12p3.orig/config/config-dist.ini
+++ phpwiki-1.3.12p3/config/config-dist.ini
@@ -31,7 +31,7 @@
 ; bottom of each page. 65 for a more verbose level with AUTH hints. 
 ; See lib/config.php for all supported values.
 ; Default: 0
-;DEBUG = 1
+DEBUG = 0
 
 ; Graphical buttons on edit. Default: true
 ; Reportedly broken on MacOSX Safari
@@ -124,7 +124,7 @@
 ; It is recommended this be a relatively short WikiWord like the
 ; InterWiki monikers found in the InterWikiMap. (For examples, see
 ; lib/interwiki.map).
-WIKI_NAME = PhpWiki
+WIKI_NAME = DebianPhpWiki
 
 ; Username and password of administrator.
 ;
@@ -138,11 +138,9 @@
 ; functions. On all other occasions you should simply log in with your
 ; regular WikiName.
 ; If your password contains special chars like ";" or ":" better quote it in double-quotes.
-;ADMIN_USER = 
-
-; You must set this! Username and password of the administrator.
-; ADMIN_PASSWD is ignored on HttpAuth
-;ADMIN_PASSWD =
+ADMIN_USER = DebianWikiAdmin
+;  Wiki admin login is disabled by default, please see README.Debian.
+ADMIN_PASSWD = *
 
 ; It is recommended that you use encrypted passwords to be stored in the 
 ; config.ini and the users homepages metadata.
@@ -162,7 +160,7 @@
 ; If set, reverse dns lookups will be performed to attempt to convert
 ; the user's IP number into a host name, in the case where the http
 ; server does not do this.
-ENABLE_REVERSE_DNS = true
+ENABLE_REVERSE_DNS = false
 
 ; Private ZIP Dumps of All Wiki Pages
 ;
@@ -263,7 +261,7 @@
 ; WARNING: Compressing the output has been reported to cause problems
 ; when PHP is running on MacOSX or on redirected requests.
 ; This setting should now be correctly determined automatically.
-;COMPRESS_OUTPUT = false
+COMPRESS_OUTPUT = false
 
 ; This controls how PhpWiki sets the HTTP cache control
 ; headers (Expires: and Cache-Control:) 
@@ -350,78 +348,7 @@
 ; Part Two: Database Selection
 ;======================================================================
 
-; Select the database backend type:
-;
-;       SQL:   access one of several SQL databases using the PEAR DB library.
-;       ADODB: uses the ADODB library for data access.     (most general)
-;       PDO:   The new PHP5 dataobkject library. (experimental, no paging yet)
-;       dba:   use one of the standard UNIX dbm libraries. Use BerkeleyDB (db3,4) (fastest)
-;       file:  use a flat file database. (easiest)
-;       cvs:   use a CVS server to store everything. (experimental, not recommended)
-DATABASE_TYPE = dba
-   
-; Prefix for filenames or table names
-;
-; Currently you MUST EDIT THE SQL file too (in the schemas/
-; directory because we aren't doing on the fly sql generation
-; during the installation.
-; Note: This prefix is NOT prepended to the default DBAUTH_
-;       tables user, pref and member!
-;DATABASE_PREFIX = phpwiki_
-
-; For SQL based backends, specify the database as a DSN (Data Source Name),
-; a kind of URL for databases.
-;
-; The most general form of a DSN looks like:
-;
-;       dbtype(dbsyntax)://username:password@protocol+hostspec/database?option=value&option2=value2
-;
-; For a MySQL database, the following should work:
-;
-;       mysql://user:password@host/databasename
-;
-; To connect over a unix socket, use something like
-;
-;       mysql://user:password@unix(/path/to/socket)/databasename
-;
-; Valid values for dbtype are mysql, pgsql, or sqlite.
-;
-DATABASE_DSN = "mysql://guest@unix(/var/lib/mysql/mysql.sock)/test"
-
-; Keep persistent connections: (mysql_pconnect, ...)
-; Recommended is false for bigger servers, and true for small servers 
-; with not so many connections. postgresql: Please leave it false. Default: false
-; Should really be set as database option in the DSN above.
-DATABASE_PERSISTENT = false
-
-; A table to store session information.  Only needed by SQL backends.
-;
-; A word of warning - any prefix defined above will be prepended to whatever
-; is given here.
-DATABASE_SESSION_TABLE = session
-
-; For the file and dba backends, this specifies where the data files will be
-; located.  Ensure that the user that the webserver runs as has write access
-; to this directory.
-;
-; WARNING: leaving this as the default of '/tmp' will almost guarantee that
-; you'll lose your wiki data at some stage.
-DATABASE_DIRECTORY = /tmp
-
-; For the dba backend, this defines which DBA variant you wish to use.
-;       gdbm - commonly available, Fedora not. Not recommended anymore.
-;       db2 - Berkeley DB v2; not supported by modern versions of PHP.
-;       db3 - Berkeley DB v3; as per db2. The best on Windows.
-;       db4 - Berkeley DB v4; current version, however PHP has some issues
-;               with it's db4 support.
-;       dbm - Older dba handler; suffers from limits on the size of data
-;               items.
-; Better not use other hacks such as inifile, flatfile or cdb.
-DATABASE_DBA_HANDLER = gdbm
-
-; How long will the system wait for a database operation to complete?
-; Specified in seconds.
-DATABASE_TIMEOUT = 5
+##DBPARAMS##
 
 ; How often to try and optimise the database. Specified in seconds. 
 ; Set to 0 to disable optimisation completely. Default is 50 (seconds).
@@ -432,7 +359,7 @@
 ; With most modern databases (eg. Postgres) and distributions (eg. Debian)
 ; the system maintenance scripts take care of this nightly, so you will want
 ; to set this parameter to 0 (disabled).
-;DATABASE_OPTIMISE_FREQUENCY = 50
+DATABASE_OPTIMISE_FREQUENCY = 0
 
 ; Optional: Administrative SQL DB access (for action=upgrade)
 ; If action=upgrade detects (My)SQL problems, but has no ALTER permissions, 
@@ -550,7 +477,7 @@
 ; If true, users may be created by themselves. Otherwise we need seperate auth. 
 ; If such a user will create a so called HomePage with his userid, he will 
 ; be able to store his preferences and password there.
-ALLOW_BOGO_LOGIN = true
+ALLOW_BOGO_LOGIN = false
 
 ; True User Authentication:
 ; To require user passwords:
@@ -568,7 +495,9 @@
 ;   Db:            Use DBAUTH_AUTH_* (see below) with PearDB or 
 ;                   ADODB only.
 ;   LDAP:          Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN (experimental)
+;                  Debian Note: Requires php4-ldap package
 ;   IMAP:          Authenticate against IMAP_AUTH_HOST (email account)
+;                  Debian Note: Requires php4-imap package
 ;   POP3:          Authenticate against POP3_AUTH_HOST (email account)
 ;   Session:       Get username and level from a PHP session variable. (e.g. for gforge)
 ;   File:          Store username:crypted-passwords in .htaccess like files. 
@@ -614,6 +543,12 @@
 
 ; LDAP authentication options:
 ;
+; Debian Note:
+; You must have the php4-ldap package installed to use LDAP authentication.
+; This package is recommended by the PHPwiki package.
+; Failure to install this package might lead your authentication to return
+; blank pages...
+;
 ; The LDAP server to connect to.  Can either be a hostname, or a complete
 ; URL to the server (useful if you want to use ldaps or specify a different
 ; port number).
@@ -656,6 +591,12 @@
 
 ; IMAP authentication options:
 ;
+; Debian Note:
+; You must have the php4-imap package installed to use IMAP authentication.
+; This package is recommended by the PHPwiki package.
+; Failure to install this package might lead your authentication to return
+; blank pages...
+;
 ; The IMAP server to check usernames from.  Defaults to localhost.
 ;
 ; Some IMAP_AUTH_HOST samples:
@@ -995,13 +936,13 @@
 
 ; Relative URL (from the server root) of the PhpWiki
 ; script.
-;SCRIPT_NAME = /some/where/index.php
+; SCRIPT_NAME = /phpwiki/index.php
 
 ; URL of the PhpWiki install directory.  (You only need to set this
 ; if you've moved index.php out of the install directory.)  This can
 ; be either a relative URL (from the directory where the top-level
 ; PhpWiki script is) or an absolute one.
-;DATA_PATH = /home/user/phpwiki
+DATA_PATH = /phpwikidata
 
 ; Path to the PhpWiki install directory.  This is the local
 ; filesystem counterpart to DATA_PATH.  (If you have to set