diff --git a/README.md b/README.md index 621e2df..f227feb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # reha Docker -reha powered by druapl 9 in docker environement (nginx, php:8.1-fpm+drush, mariadb, redis:4, phpmyadmin) +reha powered by druapl 10 in docker environement (nginx, php:8.1-fpm+drush, mariadb, redis:4, phpmyadmin, x-debug) ## Install docker ``` @@ -33,6 +33,7 @@ cp -r ressources/drupal/settings.php src/web/sites/default/ cp -r ressources/drupal/settings.local.php src/web/sites/default/ cp -r ressources/drupal/services.yml src/web/sites/default/ ``` +### get the sites/default/salt.txt file (if you don't have it, you don't) ### get the sites/default/files folder rsync the files from you know where (if you don't, you don't) to src/sites/default/files/ diff --git a/ressources/drupal/services.yml b/ressources/drupal/services.yml index 45d986c..e69de29 100644 --- a/ressources/drupal/services.yml +++ b/ressources/drupal/services.yml @@ -1,173 +0,0 @@ -parameters: - session.storage.options: - # Default ini options for sessions. - # - # Some distributions of Linux (most notably Debian) ship their PHP - # installations with garbage collection (gc) disabled. Since Drupal depends - # on PHP's garbage collection for clearing sessions, ensure that garbage - # collection occurs by using the most common settings. - # @default 1 - gc_probability: 1 - # @default 100 - gc_divisor: 100 - # - # Set session lifetime (in seconds), i.e. the time from the user's last - # visit to the active session may be deleted by the session garbage - # collector. When a session is deleted, authenticated users are logged out, - # and the contents of the user's $_SESSION variable is discarded. - # @default 200000 - gc_maxlifetime: 200000 - # - # Set session cookie lifetime (in seconds), i.e. the time from the session - # is created to the cookie expires, i.e. when the browser is expected to - # discard the cookie. The value 0 means "until the browser is closed". - # @default 2000000 - cookie_lifetime: 2000000 - # - # Drupal automatically generates a unique session cookie name based on the - # full domain name used to access the site. This mechanism is sufficient - # for most use-cases, including multi-site deployments. However, if it is - # desired that a session can be reused across different subdomains, the - # cookie domain needs to be set to the shared base domain. Doing so assures - # that users remain logged in as they cross between various subdomains. - # To maximize compatibility and normalize the behavior across user agents, - # the cookie domain should start with a dot. - # - # @default none - # cookie_domain: '.example.com' - # - twig.config: - # Twig debugging: - # - # When debugging is enabled: - # - The markup of each Twig template is surrounded by HTML comments that - # contain theming information, such as template file name suggestions. - # - Note that this debugging markup will cause automated tests that directly - # check rendered HTML to fail. When running automated tests, 'debug' - # should be set to FALSE. - # - The dump() function can be used in Twig templates to output information - # about template variables. - # - Twig templates are automatically recompiled whenever the source code - # changes (see auto_reload below). - # - # For more information about debugging Twig templates, see - # https://www.drupal.org/node/1906392. - # - # Not recommended in production environments - # @default false - debug: false - # Twig auto-reload: - # - # Automatically recompile Twig templates whenever the source code changes. - # If you don't provide a value for auto_reload, it will be determined - # based on the value of debug. - # - # Not recommended in production environments - # @default null - auto_reload: null - # Twig cache: - # - # By default, Twig templates will be compiled and stored in the filesystem - # to increase performance. Disabling the Twig cache will recompile the - # templates from source each time they are used. In most cases the - # auto_reload setting above should be enabled rather than disabling the - # Twig cache. - # - # Not recommended in production environments - # @default true - cache: true - renderer.config: - # Renderer required cache contexts: - # - # The Renderer will automatically associate these cache contexts with every - # render array, hence varying every render array by these cache contexts. - # - # @default ['languages:language_interface', 'theme', 'user.permissions'] - required_cache_contexts: ['languages:language_interface', 'theme', 'user.permissions'] - # Renderer automatic placeholdering conditions: - # - # Drupal allows portions of the page to be automatically deferred when - # rendering to improve cache performance. That is especially helpful for - # cache contexts that vary widely, such as the active user. On some sites - # those may be different, however, such as sites with only a handful of - # users. If you know what the high-cardinality cache contexts are for your - # site, specify those here. If you're not sure, the defaults are fairly safe - # in general. - # - # For more information about rendering optimizations see - # https://www.drupal.org/developing/api/8/render/arrays/cacheability#optimizing - auto_placeholder_conditions: - # Max-age at or below which caching is not considered worthwhile. - # - # Disable by setting to -1. - # - # @default 0 - max-age: 0 - # Cache contexts with a high cardinality. - # - # Disable by setting to []. - # - # @default ['session', 'user'] - contexts: ['session', 'user'] - # Tags with a high invalidation frequency. - # - # Disable by setting to []. - # - # @default [] - tags: [] - # Cacheability debugging: - # - # Responses with cacheability metadata (CacheableResponseInterface instances) - # get X-Drupal-Cache-Tags, X-Drupal-Cache-Contexts and X-Drupal-Cache-Max-Age - # headers. - # - # For more information about debugging cacheable responses, see - # https://www.drupal.org/developing/api/8/response/cacheable-response-interface - # - # Not recommended in production environments - # @default false - http.response.debug_cacheability_headers: false - factory.keyvalue: {} - # Default key/value storage service to use. - # @default keyvalue.database - # default: keyvalue.database - # Collection-specific overrides. - # state: keyvalue.database - factory.keyvalue.expirable: {} - # Default key/value expirable storage service to use. - # @default keyvalue.database.expirable - # default: keyvalue.database.expirable - # Allowed protocols for URL generation. - filter_protocols: - - http - - https - - ftp - - news - - nntp - - tel - - telnet - - mailto - - irc - - ssh - - sftp - - webcal - - rtsp - - # Configure Cross-Site HTTP requests (CORS). - # Read https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS - # for more information about the topic in general. - # Note: By default the configuration is disabled. - cors.config: - enabled: false - # Specify allowed headers, like 'x-allowed-header'. - allowedHeaders: [] - # Specify allowed request methods, specify ['*'] to allow all possible ones. - allowedMethods: [] - # Configure requests allowed from specific origins. - allowedOrigins: ['*'] - # Sets the Access-Control-Expose-Headers header. - exposedHeaders: false - # Sets the Access-Control-Max-Age header. - maxAge: false - # Sets the Access-Control-Allow-Credentials header. - supportsCredentials: false diff --git a/ressources/drupal/settings.local.php b/ressources/drupal/settings.local.php index c032484..7cb0e68 100644 --- a/ressources/drupal/settings.local.php +++ b/ressources/drupal/settings.local.php @@ -1,6 +1,6 @@ 'Discussion board', +# 'Home' => 'Front page', # '@count min' => '@count minutes', # ]; @@ -724,6 +751,7 @@ $settings['container_yamls'][] = $app_root . '/' . $site_path . '/services.yml'; * * @see https://www.drupal.org/docs/installing-drupal/trusted-host-settings */ +# $settings['trusted_host_patterns'] = []; /** * The default list of directories that will be ignored by Drupal's file API. @@ -815,6 +843,31 @@ $settings['migrate_node_migrate_type_classic'] = FALSE; # $settings['migrate_file_public_path'] = ''; # $settings['migrate_file_private_path'] = ''; + +$databases['default']['default'] = array ( + 'database' => 'reha', + 'username' => 'root', + 'password' => 'reha', + 'prefix' => '', + 'host' => 'mysql', + 'port' => '3306', + 'isolation_level' => 'READ COMMITTED', + 'namespace' => 'Drupal\\mysql\\Driver\\Database\\mysql', + 'driver' => 'mysql', + 'autoload' => 'core/modules/mysql/src/Driver/Database/mysql/', +); + +// $settings['config_sync_directory'] = 'sites/default/files/config_5PHkm650Kborp3jyACwlzlrRvkGMk6irq60CtDxNvV3soZZxwuAG_w6rbFkNr-hdH1zlZT00ZA/sync'; +$settings['config_sync_directory'] = '../config/sync'; + +$settings['redis.connection']['interface'] = 'PhpRedis'; +$settings['redis.connection']['host'] = 'redis'; +#$conf['redis_cache_socket'] = '/var/run/redis/redis.sock'; +$settings['cache']['default'] = 'cache.backend.redis'; +$settings['redis.connection']['base'] = '1'; +$settings['cache_prefix'] = 'd10'; + + /** * Load local development override configuration, if available. * @@ -833,26 +886,3 @@ if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { include $app_root . '/' . $site_path . '/settings.local.php'; } - -$databases['default']['default'] = array ( - 'database' => 'rorschach', - 'username' => 'rorschach', - 'password' => 'rorschach', - 'prefix' => '', - 'host' => 'mysql', - 'port' => '3306', - 'namespace' => 'Drupal\\mysql\\Driver\\Database\\mysql', - 'driver' => 'mysql', - 'autoload' => 'core/modules/mysql/src/Driver/Database/mysql/', -); - - -$settings['config_sync_directory'] = '../config/sync'; - - -$settings['redis.connection']['interface'] = 'PhpRedis'; -$settings['redis.connection']['host'] = 'redis'; -#$conf['redis_cache_socket'] = '/var/run/redis/redis.sock'; -$settings['cache']['default'] = 'cache.backend.redis'; -$settings['redis.connection']['base'] = '1'; -$settings['cache_prefix'] = 'd9'; diff --git a/src b/src index 964bcd5..5998f9f 160000 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit 964bcd5b189a0ed758e3d0c6be1a06d681f8b2f5 +Subproject commit 5998f9fc27799bf58a017ade00105f2c60ce8544