From a309ea2be2e07e02bcc12b7fde9aebacda5b257e Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Tue, 8 May 2007 16:36:55 +0000 Subject: - Patch #99011 by merlinofchaos: remove sites/default/settings.php and ship with sites/default/default.settings.php. --- sites/default/default.settings.php | 179 +++++++++++++++++++++++++++++++++++++ sites/default/settings.php | 179 ------------------------------------- 2 files changed, 179 insertions(+), 179 deletions(-) create mode 100644 sites/default/default.settings.php delete mode 100644 sites/default/settings.php (limited to 'sites') diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php new file mode 100644 index 000000000..f0289e945 --- /dev/null +++ b/sites/default/default.settings.php @@ -0,0 +1,179 @@ + 'main_', + * 'users' => 'shared_', + * 'sessions' => 'shared_', + * 'role' => 'shared_', + * 'authmap' => 'shared_', + * 'sequences' => 'shared_', + * ); + * + * Database URL format: + * $db_url = 'mysql://username:password@localhost/databasename'; + * $db_url = 'mysqli://username:password@localhost/databasename'; + * $db_url = 'pgsql://username:password@localhost/databasename'; + */ +$db_url = 'mysql://username:password@localhost/databasename'; +$db_prefix = ''; + +/** + * 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 URL to your Drupal installation. + * + * You might also want to force users to use a given domain. + * See the .htaccess file for more information. + * + * Examples: + * $base_url = 'http://www.example.com'; + * $base_url = 'http://www.example.com:8888'; + * $base_url = 'http://www.example.com/drupal'; + * $base_url = 'https://www.example.com:8888/drupal'; + * + * It is not allowed to have a trailing slash; Drupal will add it + * for you. + */ +# $base_url = 'http://www.example.com'; // NO trailing slash! + +/** + * PHP settings: + * + * To see what PHP settings are possible, including whether they can + * be set at runtime (ie., when ini_set() occurs), read the PHP + * documentation at http://www.php.net/manual/en/ini.php#ini.list + * and take a look at the .htaccess file to see which non-runtime + * settings are used there. Settings defined here should not be + * duplicated there so as to avoid conflict issues. + */ +ini_set('arg_separator.output', '&'); +ini_set('magic_quotes_runtime', 0); +ini_set('magic_quotes_sybase', 0); +ini_set('session.cache_expire', 200000); +ini_set('session.cache_limiter', 'none'); +ini_set('session.cookie_lifetime', 2000000); +ini_set('session.gc_maxlifetime', 200000); +ini_set('session.save_handler', 'user'); +ini_set('session.use_only_cookies', 1); +ini_set('session.use_trans_sid', 0); +ini_set('url_rewriter.tags', ''); + +/** + * Drupal automatically generates a unique session cookie name for each site + * based on on its full domain name. If you have multiple domains pointing at + * the same Drupal site, you can either redirect them all to a single + * domain (see comment in .htaccess), or uncomment the line below and specify + * their shared base domain. Doing so assures that users remain logged in as they + * cross between your various domains. +*/ + +#$cookie_domain = 'example.com'; + +/** + * Variable overrides: + * + * To override specific entries in the 'variable' table for this site, + * set them here. You usually don't need to use this feature. This is + * useful in a configuration file for a vhost or directory, rather than + * the default settings.php. Any configuration setting from the 'variable' + * table can be given a new value. + * + * Remove the leading hash signs to enable. + */ +# $conf = array( +# 'site_name' => 'My Drupal site', +# 'theme_default' => 'minnelli', +# 'anonymous' => 'Visitor', +# ); + +/** + * String overrides: + * + * To override specific strings on your site with or without enabling locale + * module, add an entry to this list. This functionality allows you to change + * a small number of your site's default English language interface strings. + * + * Remove the leading hash signs to enable. + */ +# $conf['locale_custom_strings_en'] = array( +# 'forum' => 'Discussion board', +# '@count min' => '@count minutes', +# ); diff --git a/sites/default/settings.php b/sites/default/settings.php deleted file mode 100644 index f0289e945..000000000 --- a/sites/default/settings.php +++ /dev/null @@ -1,179 +0,0 @@ - 'main_', - * 'users' => 'shared_', - * 'sessions' => 'shared_', - * 'role' => 'shared_', - * 'authmap' => 'shared_', - * 'sequences' => 'shared_', - * ); - * - * Database URL format: - * $db_url = 'mysql://username:password@localhost/databasename'; - * $db_url = 'mysqli://username:password@localhost/databasename'; - * $db_url = 'pgsql://username:password@localhost/databasename'; - */ -$db_url = 'mysql://username:password@localhost/databasename'; -$db_prefix = ''; - -/** - * 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 URL to your Drupal installation. - * - * You might also want to force users to use a given domain. - * See the .htaccess file for more information. - * - * Examples: - * $base_url = 'http://www.example.com'; - * $base_url = 'http://www.example.com:8888'; - * $base_url = 'http://www.example.com/drupal'; - * $base_url = 'https://www.example.com:8888/drupal'; - * - * It is not allowed to have a trailing slash; Drupal will add it - * for you. - */ -# $base_url = 'http://www.example.com'; // NO trailing slash! - -/** - * PHP settings: - * - * To see what PHP settings are possible, including whether they can - * be set at runtime (ie., when ini_set() occurs), read the PHP - * documentation at http://www.php.net/manual/en/ini.php#ini.list - * and take a look at the .htaccess file to see which non-runtime - * settings are used there. Settings defined here should not be - * duplicated there so as to avoid conflict issues. - */ -ini_set('arg_separator.output', '&'); -ini_set('magic_quotes_runtime', 0); -ini_set('magic_quotes_sybase', 0); -ini_set('session.cache_expire', 200000); -ini_set('session.cache_limiter', 'none'); -ini_set('session.cookie_lifetime', 2000000); -ini_set('session.gc_maxlifetime', 200000); -ini_set('session.save_handler', 'user'); -ini_set('session.use_only_cookies', 1); -ini_set('session.use_trans_sid', 0); -ini_set('url_rewriter.tags', ''); - -/** - * Drupal automatically generates a unique session cookie name for each site - * based on on its full domain name. If you have multiple domains pointing at - * the same Drupal site, you can either redirect them all to a single - * domain (see comment in .htaccess), or uncomment the line below and specify - * their shared base domain. Doing so assures that users remain logged in as they - * cross between your various domains. -*/ - -#$cookie_domain = 'example.com'; - -/** - * Variable overrides: - * - * To override specific entries in the 'variable' table for this site, - * set them here. You usually don't need to use this feature. This is - * useful in a configuration file for a vhost or directory, rather than - * the default settings.php. Any configuration setting from the 'variable' - * table can be given a new value. - * - * Remove the leading hash signs to enable. - */ -# $conf = array( -# 'site_name' => 'My Drupal site', -# 'theme_default' => 'minnelli', -# 'anonymous' => 'Visitor', -# ); - -/** - * String overrides: - * - * To override specific strings on your site with or without enabling locale - * module, add an entry to this list. This functionality allows you to change - * a small number of your site's default English language interface strings. - * - * Remove the leading hash signs to enable. - */ -# $conf['locale_custom_strings_en'] = array( -# 'forum' => 'Discussion board', -# '@count min' => '@count minutes', -# ); -- cgit v1.2.3