[Pkg-drupal-commits] r2171 - in /branches/drupal7/debian: changelog etc/settings.php
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Sat Mar 5 17:22:34 UTC 2011
Author: luigi
Date: Sat Mar 5 17:22:32 2011
New Revision: 2171
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2171
Log:
Updated default configuration file
Modified:
branches/drupal7/debian/changelog
branches/drupal7/debian/etc/settings.php
Modified: branches/drupal7/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/changelog?rev=2171&op=diff
==============================================================================
--- branches/drupal7/debian/changelog (original)
+++ branches/drupal7/debian/changelog Sat Mar 5 17:22:32 2011
@@ -1,6 +1,9 @@
drupal7 (7.0-1) UNRELEASED; urgency=low
* New upstream release
+
+ * debian/etc/settings.php
+ - Updated default configuration file
[ Kinga Marjai ]
* debian/control
Modified: branches/drupal7/debian/etc/settings.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/etc/settings.php?rev=2171&op=diff
==============================================================================
--- branches/drupal7/debian/etc/settings.php (original)
+++ branches/drupal7/debian/etc/settings.php Sat Mar 5 17:22:32 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: default.settings.php,v 1.40 2010/01/30 07:59:26 dries Exp $
+// $Id: default.settings.php,v 1.51 2010/10/11 23:49:48 dries Exp $
/**
* @file
@@ -53,7 +53,7 @@
*
* Each database connection is specified as an array of settings,
* similar to the following:
- *
+ * @code
* array(
* 'driver' => 'mysql',
* 'database' => 'databasename',
@@ -61,7 +61,10 @@
* 'password' => 'password',
* 'host' => 'localhost',
* 'port' => 3306,
+ * 'prefix' => 'myprefix_',
+ * 'collation' => 'utf8_general_ci',
* );
+ * @endcode
*
* The "driver" property indicates what Drupal database driver the
* connection should use. This is usually the same as the name of the
@@ -85,11 +88,12 @@
* fall back to the single master server.
*
* The general format for the $databases array is as follows:
- *
+ * @code
* $databases['default']['default'] = $info_array;
* $databases['default']['slave'][] = $info_array;
* $databases['default']['slave'][] = $info_array;
* $databases['extra']['default'] = $info_array;
+ * @endcode
*
* In the above example, $info_array is an array of settings described above.
* The first line sets a "default" database that has one master database
@@ -99,45 +103,66 @@
* "extra".
*
* For a single database configuration, the following is sufficient:
- *
+ * @code
* $databases['default']['default'] = array(
* 'driver' => 'mysql',
* 'database' => 'databasename',
* 'username' => 'username',
* 'password' => 'password',
* 'host' => 'localhost',
+ * 'prefix' => 'main_',
+ * 'collation' => 'utf8_general_ci',
* );
+ * @endcode
*
* You can optionally set prefixes for some or all database table names
- * by using the $db_prefix setting. If a prefix is specified, the table
+ * by using the 'prefix' setting. If a prefix is specified, the table
* name will be prepended with its value. Be sure to use valid database
* characters only, usually alphanumeric and underscore. If no prefixes
* are desired, leave it as an empty string ''.
*
- * To have all database names prefixed, set $db_prefix as a string:
- *
- * $db_prefix = 'main_';
- *
- * To provide prefixes for specific tables, set $db_prefix as an array.
+ * To have all database names prefixed, set 'prefix' as a string:
+ * @code
+ * 'prefix' => 'main_',
+ * @endcode
+ * To provide prefixes for specific tables, set 'prefix' as an array.
* The array's keys are the table names and the values are the prefixes.
- * The 'default' element holds the prefix for any tables not specified
- * elsewhere in the array. Example:
- *
- * $db_prefix = array(
+ * The 'default' element is mandatory and holds the prefix for any tables
+ * not specified elsewhere in the array. Example:
+ * @code
+ * 'prefix' => array(
* 'default' => 'main_',
- * 'users' => 'shared_',
+ * 'users' => 'shared_',
* 'sessions' => 'shared_',
* 'role' => 'shared_',
* 'authmap' => 'shared_',
+ * ),
+ * @endcode
+ * You can also use a reference to a schema/database as a prefix. This maybe
+ * useful if your Drupal installation exists in a schema that is not the default
+ * or you want to access several databases from the same code base at the same
+ * time.
+ * Example:
+ * @code
+ * 'prefix' => array(
+ * 'default' => 'main.',
+ * 'users' => 'shared.',
+ * 'sessions' => 'shared.',
+ * 'role' => 'shared.',
+ * 'authmap' => 'shared.',
* );
+ * @endcode
+ * NOTE: MySQL and SQLite's definition of a schema is a database.
*
* Database configuration format:
+ * @code
* $databases['default']['default'] = array(
* 'driver' => 'mysql',
* 'database' => 'databasename',
* 'username' => 'username',
* 'password' => 'password',
* 'host' => 'localhost',
+ * 'prefix' => '',
* );
* $databases['default']['default'] = array(
* 'driver' => 'pgsql',
@@ -145,20 +170,20 @@
* 'username' => 'username',
* 'password' => 'password',
* 'host' => 'localhost',
+ * 'prefix' => '',
* );
* $databases['default']['default'] = array(
* 'driver' => 'sqlite',
* 'database' => '/path/to/databasefilename',
* );
- */
-require_once('dbconfig.php');
-if (!isset($dbserver) || empty($dbserver))
- $dbserver='localhost';
-$db_url = "$dbtype://$dbuser:$dbpass@$dbserver/$dbname";
-$db_prefix = '';
-
-/**
- * Access control for update.php script
+ * @endcode
+ */
+$databases = array();
+if (file_exists('dbconfig.php'))
+ require_once('dbconfig.php');
+
+/**
+ * Access control for update.php script.
*
* If you are updating your Drupal installation using the update.php script but
* are not logged in using either an account with the "Administer software
@@ -192,9 +217,10 @@
/**
* Base URL (optional).
*
- * If you are experiencing issues with different site domains,
- * uncomment the Base URL statement below (remove the leading hash sign)
- * and fill in the absolute URL to your Drupal installation.
+ * If Drupal is generating incorrect URLs on your site, which could
+ * be in HTML headers (links to CSS and JS files) or visible links on pages
+ * (such as in menus), uncomment the Base URL statement below (remove the
+ * leading hash sign) and fill in the absolute URL to your Drupal installation.
*
* You might also want to force users to use a given domain.
* See the .htaccess file for more information.
@@ -217,7 +243,7 @@
*
* To see what PHP settings are possible, including whether they can be set at
* runtime (by using ini_set()), read the PHP documentation:
- * http://www.php.net/manual/en/ini.php#ini.list
+ * http://www.php.net/manual/en/ini.list.php
* See drupal_initialize_variables() in includes/bootstrap.inc for required
* runtime settings and the .htaccess file for non-runtime settings. Settings
* defined there should not be duplicated here so as to avoid conflict issues.
@@ -246,6 +272,17 @@
* the cookie. The value 0 means "until the browser is closed".
*/
ini_set('session.cookie_lifetime', 2000000);
+
+/**
+ * If you encounter a situation where users post a large amount of text, and
+ * the result is stripped out upon viewing but can still be edited, Drupal's
+ * output filter may not have sufficient memory to process it. If you
+ * experience this issue, you may wish to uncomment the following two lines
+ * and increase the limits of these variables. For more information, see
+ * http://php.net/manual/en/pcre.configuration.php.
+ */
+# ini_set('pcre.backtrack_limit', 200000);
+# ini_set('pcre.recursion_limit', 200000);
/**
* Drupal automatically generates a unique session cookie name for each site
@@ -286,11 +323,9 @@
* theme. It is located inside 'modules/system/maintenance-page.tpl.php'.
* Note: This setting does not apply to installation and update pages.
*/
-# $conf['maintenance_theme'] = 'garland';
-
-/**
- * reverse_proxy accepts a boolean value.
- *
+# $conf['maintenance_theme'] = 'bartik';
+
+/**
* Enable this setting to determine the correct IP address of the remote
* client by examining information stored in the X-Forwarded-For headers.
* X-Forwarded-For headers are a standard mechanism for identifying client
@@ -305,6 +340,15 @@
* a shared hosting environment, this setting should remain commented out.
*/
# $conf['reverse_proxy'] = TRUE;
+
+/**
+ * Set this value if your proxy server sends the client IP in a header other
+ * than X-Forwarded-For.
+ *
+ * The "X-Forwarded-For" header is a comma+space separated list of IP addresses,
+ * only the last one (the left-most) will be used.
+ */
+# $conf['reverse_proxy_header'] = 'HTTP_X_CLUSTER_CLIENT_IP';
/**
* reverse_proxy accepts an array of IP addresses.
@@ -338,6 +382,21 @@
# $conf['omit_vary_cookie'] = TRUE;
/**
+ * CSS/JS aggregated file gzip compression:
+ *
+ * By default, when CSS or JS aggregation and clean URLs are enabled Drupal will
+ * store a gzip compressed (.gz) copy of the aggregated files. If this file is
+ * available then rewrite rules in the default .htaccess file will serve these
+ * files to browsers that accept gzip encoded content. This allows pages to load
+ * faster for these users and has minimal impact on server load. If you are
+ * using a webserver other than Apache httpd, or a caching reverse proxy that is
+ * configured to cache and compress these files itself you may want to uncomment
+ * one or both of the below lines, which will prevent gzip files being stored.
+ */
+# $conf['css_gzip_compression'] = FALSE;
+# $conf['js_gzip_compression'] = FALSE;
+
+/**
* String overrides:
*
* To override specific strings on your site with or without enabling locale
More information about the Pkg-drupal-commits
mailing list