Update to drupal 8.0.0-rc1. For more information, see https://www.drupal.org/node/2582663
This commit is contained in:
parent
eb34d130a8
commit
f32e58e4b1
8476 changed files with 211648 additions and 170042 deletions
|
@ -223,13 +223,13 @@ $databases = array();
|
|||
* Location of the site configuration files.
|
||||
*
|
||||
* The $config_directories array specifies the location of file system
|
||||
* directories used for configuration data. On install, "active" and "staging"
|
||||
* directories are created for configuration. The staging directory is used for
|
||||
* directories used for configuration data. On install, "active" and "sync"
|
||||
* directories are created for configuration. The sync directory is used for
|
||||
* configuration imports; the active directory is not used by default, since the
|
||||
* default storage for active configuration is the database rather than the file
|
||||
* system (this can be changed; see "Active configuration settings" below).
|
||||
*
|
||||
* The default location for the active and staging directories is inside a
|
||||
* The default location for the active and sync directories is inside a
|
||||
* randomly-named directory in the public files path; this setting allows you to
|
||||
* override these locations. If you use files for the active configuration, you
|
||||
* can enhance security by putting the active configuration outside your
|
||||
|
@ -238,8 +238,7 @@ $databases = array();
|
|||
* Example:
|
||||
* @code
|
||||
* $config_directories = array(
|
||||
* CONFIG_ACTIVE_DIRECTORY => '/some/directory/outside/webroot',
|
||||
* CONFIG_STAGING_DIRECTORY => '/another/directory/outside/webroot',
|
||||
* CONFIG_SYNC_DIRECTORY => '/another/directory/outside/webroot',
|
||||
* );
|
||||
* @endcode
|
||||
*/
|
||||
|
@ -454,6 +453,19 @@ if ($settings['hash_salt']) {
|
|||
# $settings['file_chmod_directory'] = 0775;
|
||||
# $settings['file_chmod_file'] = 0664;
|
||||
|
||||
/**
|
||||
* Public file base URL:
|
||||
*
|
||||
* An alternative base URL to be used for serving public files. This must
|
||||
* include any leading directory path.
|
||||
*
|
||||
* A different value from the domain used by Drupal to be used for accessing
|
||||
* public files. This can be used for a simple CDN integration, or to improve
|
||||
* security by serving user-uploaded files from a different domain or subdomain
|
||||
* pointing to the same server. Do not include a trailing slash.
|
||||
*/
|
||||
# $settings['file_public_base_url'] = 'http://downloads.example.com/files';
|
||||
|
||||
/**
|
||||
* Public file path:
|
||||
*
|
||||
|
@ -515,28 +527,6 @@ if ($settings['hash_salt']) {
|
|||
*/
|
||||
# $settings['maintenance_theme'] = 'bartik';
|
||||
|
||||
/**
|
||||
* Base URL (optional).
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* 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:
|
||||
*
|
||||
|
@ -610,16 +600,16 @@ if ($settings['hash_salt']) {
|
|||
*
|
||||
* The options below return a simple, fast 404 page for URLs matching a
|
||||
* specific pattern:
|
||||
* - $conf['system.performance']['fast_404']['exclude_paths']: A regular
|
||||
* - $config['system.performance']['fast_404']['exclude_paths']: A regular
|
||||
* expression to match paths to exclude, such as images generated by image
|
||||
* styles, or dynamically-resized images. The default pattern provided below
|
||||
* also excludes the private file system. If you need to add more paths, you
|
||||
* can add '|path' to the expression.
|
||||
* - $conf['system.performance']['fast_404']['paths']: A regular expression to
|
||||
* - $config['system.performance']['fast_404']['paths']: A regular expression to
|
||||
* match paths that should return a simple 404 page, rather than the fully
|
||||
* themed 404 page. If you don't have any aliases ending in htm or html you
|
||||
* can add '|s?html?' to the expression.
|
||||
* - $conf['system.performance']['fast_404']['html']: The html to return for
|
||||
* - $config['system.performance']['fast_404']['html']: The html to return for
|
||||
* simple 404 pages.
|
||||
*
|
||||
* Remove the leading hash signs if you would like to alter this functionality.
|
||||
|
|
|
@ -38,12 +38,12 @@ $is_installer_url = (strpos($_SERVER['SCRIPT_NAME'], '/core/install.php') === 0)
|
|||
*/
|
||||
if ($is_installer_url) {
|
||||
$config_directories = array(
|
||||
CONFIG_STAGING_DIRECTORY => 'sites/default/files',
|
||||
CONFIG_SYNC_DIRECTORY => 'sites/default/files',
|
||||
);
|
||||
}
|
||||
else {
|
||||
$config_directories = array(
|
||||
CONFIG_STAGING_DIRECTORY => 'sites/default/config',
|
||||
CONFIG_SYNC_DIRECTORY => 'sites/default/config',
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -52,12 +52,25 @@ $config['system.performance']['js']['preprocess'] = FALSE;
|
|||
/**
|
||||
* Disable the render cache (this includes the page cache).
|
||||
*
|
||||
* Note: you should test with the render cache enabled, to ensure the correct
|
||||
* cacheability metadata is present. However, in the early stages of
|
||||
* development, you may want to disable it.
|
||||
*
|
||||
* This setting disables the render cache by using the Null cache back-end
|
||||
* defined by the development.services.yml file above.
|
||||
*
|
||||
* Do not use this setting until after the site is installed.
|
||||
*/
|
||||
$settings['cache']['bins']['render'] = 'cache.backend.null';
|
||||
# $settings['cache']['bins']['render'] = 'cache.backend.null';
|
||||
|
||||
/**
|
||||
* Disable Dynamic Page Cache.
|
||||
*
|
||||
* Note: you should test with Dynamic Page Cache enabled, to ensure the correct
|
||||
* cacheability metadata is present (and hence the expected behavior). However,
|
||||
* in the early stages of development, you may want to disable it.
|
||||
*/
|
||||
# $settings['cache']['bins']['dynamic_page_cache'] = 'cache.backend.null';
|
||||
|
||||
/**
|
||||
* Allow test modules and themes to be installed.
|
||||
|
|
|
@ -50,6 +50,6 @@
|
|||
* @endcode
|
||||
*
|
||||
* @see default.settings.php
|
||||
* @see conf_path()
|
||||
* @see \Drupal\Core\DrupalKernel::getSitePath()
|
||||
* @see https://www.drupal.org/documentation/install/multi-site
|
||||
*/
|
||||
|
|
Reference in a new issue