|
@@ -1,6 +1,6 @@
|
|
<?php
|
|
<?php
|
|
|
|
|
|
-// @codingStandardsIgnoreFile
|
|
|
|
|
|
+// phpcs:ignoreFile
|
|
|
|
|
|
/**
|
|
/**
|
|
* @file
|
|
* @file
|
|
@@ -282,7 +282,7 @@ $databases = [];
|
|
* $settings['hash_salt'] = file_get_contents('/home/example/salt.txt');
|
|
* $settings['hash_salt'] = file_get_contents('/home/example/salt.txt');
|
|
* @endcode
|
|
* @endcode
|
|
*/
|
|
*/
|
|
-$settings['hash_salt'] = 'J3uCZFsrehabVLg4kix5DnlWoM-WZqkIQ_Nj0yfO8LffH6os3PhEvHEiYLSXP3Jk6RiklhX2jw';
|
|
|
|
|
|
+$settings['hash_salt'] = 'z1BWnQhESiK-rmgqxa5rm2EIholCgXssuFBE_L8ahFZ8l_IHaNumk1b7D8MWs7DjyWf5F0h9VQ';
|
|
|
|
|
|
/**
|
|
/**
|
|
* Deployment identifier.
|
|
* Deployment identifier.
|
|
@@ -308,16 +308,18 @@ $settings['hash_salt'] = 'J3uCZFsrehabVLg4kix5DnlWoM-WZqkIQ_Nj0yfO8LffH6os3PhEvH
|
|
$settings['update_free_access'] = FALSE;
|
|
$settings['update_free_access'] = FALSE;
|
|
|
|
|
|
/**
|
|
/**
|
|
- * Fallback to HTTP for Update Manager.
|
|
|
|
|
|
+ * Fallback to HTTP for Update Manager and for fetching security advisories.
|
|
*
|
|
*
|
|
- * If your Drupal site fails to connect to updates.drupal.org using HTTPS to
|
|
|
|
- * fetch Drupal core, module and theme update status, you may uncomment this
|
|
|
|
- * setting and set it to TRUE to allow an insecure fallback to HTTP. Note that
|
|
|
|
- * doing so will open your site up to a potential man-in-the-middle attack. You
|
|
|
|
- * should instead attempt to resolve the issues before enabling this option.
|
|
|
|
|
|
+ * If your site fails to connect to updates.drupal.org over HTTPS (either when
|
|
|
|
+ * fetching data on available updates, or when fetching the feed of critical
|
|
|
|
+ * security announcements), you may uncomment this setting and set it to TRUE to
|
|
|
|
+ * allow an insecure fallback to HTTP. Note that doing so will open your site up
|
|
|
|
+ * to a potential man-in-the-middle attack. You should instead attempt to
|
|
|
|
+ * resolve the issues before enabling this option.
|
|
* @see https://www.drupal.org/docs/system-requirements/php-requirements#openssl
|
|
* @see https://www.drupal.org/docs/system-requirements/php-requirements#openssl
|
|
* @see https://en.wikipedia.org/wiki/Man-in-the-middle_attack
|
|
* @see https://en.wikipedia.org/wiki/Man-in-the-middle_attack
|
|
* @see \Drupal\update\UpdateFetcher
|
|
* @see \Drupal\update\UpdateFetcher
|
|
|
|
+ * @see \Drupal\system\SecurityAdvisories\SecurityAdvisoriesFetcher
|
|
*/
|
|
*/
|
|
# $settings['update_fetch_with_http_fallback'] = TRUE;
|
|
# $settings['update_fetch_with_http_fallback'] = TRUE;
|
|
|
|
|
|
@@ -385,17 +387,20 @@ $settings['update_free_access'] = FALSE;
|
|
* Sets which headers to trust from your reverse proxy.
|
|
* Sets which headers to trust from your reverse proxy.
|
|
*
|
|
*
|
|
* Common values are:
|
|
* Common values are:
|
|
- * - \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL
|
|
|
|
|
|
+ * - \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR
|
|
|
|
+ * - \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_HOST
|
|
|
|
+ * - \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT
|
|
|
|
+ * - \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO
|
|
* - \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED
|
|
* - \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED
|
|
*
|
|
*
|
|
* Note the default value of
|
|
* Note the default value of
|
|
* @code
|
|
* @code
|
|
- * \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL | \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED
|
|
|
|
|
|
+ * \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_HOST | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO | \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED
|
|
* @endcode
|
|
* @endcode
|
|
* is not secure by default. The value should be set to only the specific
|
|
* is not secure by default. The value should be set to only the specific
|
|
* headers the reverse proxy uses. For example:
|
|
* headers the reverse proxy uses. For example:
|
|
* @code
|
|
* @code
|
|
- * \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL
|
|
|
|
|
|
+ * \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_HOST | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO
|
|
* @endcode
|
|
* @endcode
|
|
* This would trust the following headers:
|
|
* This would trust the following headers:
|
|
* - X_FORWARDED_FOR
|
|
* - X_FORWARDED_FOR
|
|
@@ -403,11 +408,14 @@ $settings['update_free_access'] = FALSE;
|
|
* - X_FORWARDED_PROTO
|
|
* - X_FORWARDED_PROTO
|
|
* - X_FORWARDED_PORT
|
|
* - X_FORWARDED_PORT
|
|
*
|
|
*
|
|
- * @see \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL
|
|
|
|
|
|
+ * @see \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR
|
|
|
|
+ * @see \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_HOST
|
|
|
|
+ * @see \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT
|
|
|
|
+ * @see \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO
|
|
* @see \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED
|
|
* @see \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED
|
|
* @see \Symfony\Component\HttpFoundation\Request::setTrustedProxies
|
|
* @see \Symfony\Component\HttpFoundation\Request::setTrustedProxies
|
|
*/
|
|
*/
|
|
-# $settings['reverse_proxy_trusted_headers'] = \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL | \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED;
|
|
|
|
|
|
+# $settings['reverse_proxy_trusted_headers'] = \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_HOST | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO | \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED;
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -603,6 +611,21 @@ $settings['update_free_access'] = FALSE;
|
|
# ini_set('pcre.backtrack_limit', 200000);
|
|
# ini_set('pcre.backtrack_limit', 200000);
|
|
# ini_set('pcre.recursion_limit', 200000);
|
|
# ini_set('pcre.recursion_limit', 200000);
|
|
|
|
|
|
|
|
+/**
|
|
|
|
+ * Add Permissions-Policy header to disable Google FLoC.
|
|
|
|
+ *
|
|
|
|
+ * By default, Drupal sends the 'Permissions-Policy: interest-cohort=()' header
|
|
|
|
+ * to disable Google's Federated Learning of Cohorts feature, introduced in
|
|
|
|
+ * Chrome 89.
|
|
|
|
+ *
|
|
|
|
+ * See https://en.wikipedia.org/wiki/Federated_Learning_of_Cohorts for more
|
|
|
|
+ * information about FLoC.
|
|
|
|
+ *
|
|
|
|
+ * If you don't wish to disable FLoC in Chrome, you can set this value
|
|
|
|
+ * to FALSE.
|
|
|
|
+ */
|
|
|
|
+# $settings['block_interest_cohort'] = TRUE;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* Configuration overrides.
|
|
* Configuration overrides.
|
|
*
|
|
*
|
|
@@ -781,22 +804,11 @@ if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) {
|
|
}
|
|
}
|
|
|
|
|
|
$databases['default']['default'] = array (
|
|
$databases['default']['default'] = array (
|
|
- 'database' => 'popsu_d9',
|
|
|
|
|
|
+ 'database' => 'eql',
|
|
'username' => 'root',
|
|
'username' => 'root',
|
|
- 'password' => 'popsu',
|
|
|
|
|
|
+ 'password' => 'eql',
|
|
'prefix' => '',
|
|
'prefix' => '',
|
|
- 'host' => 'mysql_d9',
|
|
|
|
- 'port' => '3306',
|
|
|
|
- 'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
|
|
|
|
- 'driver' => 'mysql',
|
|
|
|
-);
|
|
|
|
-
|
|
|
|
-$databases['popsu_d7']['default'] = array (
|
|
|
|
- 'database' => 'popsu_d7',
|
|
|
|
- 'username' => 'root',
|
|
|
|
- 'password' => 'popsu',
|
|
|
|
- 'prefix' => 'dbprefix_',
|
|
|
|
- 'host' => 'mysql_d7',
|
|
|
|
|
|
+ 'host' => 'mysql',
|
|
'port' => '3306',
|
|
'port' => '3306',
|
|
'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
|
|
'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
|
|
'driver' => 'mysql',
|
|
'driver' => 'mysql',
|