diff --git a/.gitignore b/.gitignore index 00fae60..564365f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,8 @@ # Ignore configuration files that may contain sensitive information /web/sites/*/settings.local.php +# Ignore ddev settings +/web/sites/*/settings.ddev.php # Ignore paths that may contain user-generated content /web/sites/*/files diff --git a/README.md b/README.md index db9d13c..7eb20ff 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,10 @@ Sajt je dostopen preko naslova: https://yufu-manifest.ddev.site/ Lahko pa napišemo tudi `ddev launch` +v `web/sites/default/settings.local.php` dodamo vrstico, ki vključi services nastavitve, ki omogočijo CORS: + +`$settings['container_yamls'][] = DRUPAL_ROOT . '/sites/default/yufu.services.yml';` + ### Postavitev (vuejs) "prednjegadela" Najprej gremo v podfolder `nuxt` in namestimo odvisne javascript pakete: diff --git a/web/sites/default/settings.ddev.php b/web/sites/default/settings.ddev.php deleted file mode 100644 index 870ff0a..0000000 --- a/web/sites/default/settings.ddev.php +++ /dev/null @@ -1,50 +0,0 @@ - "db", - 'username' => "db", - 'password' => "db", - 'host' => $host, - 'driver' => $driver, - 'port' => $port, - 'prefix' => "", -); - -$settings['hash_salt'] = 'kShGqBypYstnMBJYmaRocqYLQcvBTMgvGbLQkdODVMavjRUyDhgBFcSAideqnFoM'; - -// This will prevent Drupal from setting read-only permissions on sites/default. -$settings['skip_permissions_hardening'] = TRUE; - -// This will ensure the site can only be accessed through the intended host -// names. Additional host patterns can be added for custom configurations. -$settings['trusted_host_patterns'] = ['.*']; - -// Don't use Symfony's APCLoader. ddev includes APCu; Composer's APCu loader has -// better performance. -$settings['class_loader_auto_detect'] = FALSE; - -// Set $settings['config_sync_directory'] if not set in settings.php. -if (empty($settings['config_sync_directory'])) { - $settings['config_sync_directory'] = 'sites/default/files/sync'; -} - -// Override drupal/symfony_mailer default config to use Mailhog -$config['symfony_mailer.mailer_transport.sendmail']['plugin'] = 'smtp'; -$config['symfony_mailer.mailer_transport.sendmail']['configuration']['user']=''; -$config['symfony_mailer.mailer_transport.sendmail']['configuration']['pass']=''; -$config['symfony_mailer.mailer_transport.sendmail']['configuration']['host']='localhost'; -$config['symfony_mailer.mailer_transport.sendmail']['configuration']['port']='1025'; - -// Deveopment services (for CORS) -$settings['container_yamls'][] = DRUPAL_ROOT . '/sites/development.services.yml'; diff --git a/web/sites/default/yufu.services.yml b/web/sites/default/yufu.services.yml new file mode 100644 index 0000000..08ea88c --- /dev/null +++ b/web/sites/default/yufu.services.yml @@ -0,0 +1,4 @@ +services: + cors.config: + enabled: true +