summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxjm2015-10-22 23:06:38 (GMT)
committerxjm2015-10-22 23:06:38 (GMT)
commit921cf91a2e025d3b660a693d2ac250ebe8cbafff (patch)
treeb3e98ee812965c904b1a1312507fd394b018416b
parentd6af6fc9644aec50c3579989e2c02167f6157e4a (diff)
Issue #2580569 by anavarre, Davinder.Snehi, Schnitzel, jhodgdon: Update documentation that mentions active CMI directory. active was removed
-rw-r--r--core/includes/install.inc4
-rw-r--r--sites/default/default.settings.php30
2 files changed, 19 insertions, 15 deletions
diff --git a/core/includes/install.inc b/core/includes/install.inc
index 162d9c9..c9fd75d 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -210,7 +210,6 @@ function drupal_get_database_types() {
* @endcode
* gets dumped as:
* @code
- * $config_directories['active'] = 'config_hash/active';
* $config_directories['sync'] = 'config_hash/sync'
* @endcode
*/
@@ -524,8 +523,7 @@ function drupal_install_config_directories() {
* Ensures that the config directory exists and is writable, or can be made so.
*
* @param string $type
- * Type of config directory to return. Drupal core provides 'active' and
- * 'sync'.
+ * Type of config directory to return. Drupal core provides 'sync'.
*
* @return bool
* TRUE if the config directory exists and is writable.
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index b1f95e2..1a6d148 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -223,22 +223,24 @@ $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 "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 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
- * document root.
+ * directories used for configuration data. On install, the "sync" directory is
+ * created. This is used for configuration imports. The "active" directory is
+ * not created 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 "sync" directory is inside a randomly-named
+ * directory in the public files path. The setting below allows you to override
+ * the "sync" location.
+ *
+ * If you use files for the "active" configuration, you can tell the
+ * Configuration system where this directory is located by adding an entry with
+ * array key CONFIG_ACTIVE_DIRECTORY.
*
* Example:
* @code
* $config_directories = array(
- * CONFIG_SYNC_DIRECTORY => '/another/directory/outside/webroot',
+ * CONFIG_SYNC_DIRECTORY => '/directory/outside/webroot',
* );
* @endcode
*/
@@ -580,6 +582,10 @@ if ($settings['hash_salt']) {
* By default, the active configuration is stored in the database in the
* {config} table. To use a different storage mechanism for the active
* configuration, do the following prior to installing:
+ * - Create an "active" directory and declare its path in $config_directories
+ * as explained under the 'Location of the site configuration files' section
+ * above in this file. To enhance security, you can declare a path that is
+ * outside your document root.
* - Override the 'bootstrap_config_storage' setting here. It must be set to a
* callable that returns an object that implements
* \Drupal\Core\Config\StorageInterface.