From bb84ca34a8707a1d5a156a01fbf45457810c2e2b Mon Sep 17 00:00:00 2001 From: Philip Peterson <1326208+philip-peterson@users.noreply.github.com> Date: Thu, 4 Jun 2026 22:52:41 -0700 Subject: [PATCH] fixes --- Dockerfile | 3 +++ .../templates/riverside-pt-home.html.twig | 2 +- web/sites/default/settings.php | 19 ++++++++----------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 426f37e..b740583 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,6 +80,9 @@ COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY docker/php/entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh +# Pass container env vars through to PHP-FPM workers (needed for settings.php overrides). +RUN echo 'clear_env = no' >> /usr/local/etc/php-fpm.d/zz-env.conf + RUN chown -R www-data:www-data web/sites/default/files && \ chmod -R 755 web/sites/default/files && \ chmod 444 web/sites/default/settings.php diff --git a/web/modules/custom/riverside_pt/templates/riverside-pt-home.html.twig b/web/modules/custom/riverside_pt/templates/riverside-pt-home.html.twig index 08404e3..2287e8d 100644 --- a/web/modules/custom/riverside_pt/templates/riverside-pt-home.html.twig +++ b/web/modules/custom/riverside_pt/templates/riverside-pt-home.html.twig @@ -100,7 +100,7 @@

Years Open

-

300

+

3,100

Patients Served

diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php index 0c929a9..b62c556 100644 --- a/web/sites/default/settings.php +++ b/web/sites/default/settings.php @@ -19,20 +19,17 @@ $settings['hash_salt'] = getenv('HASH_SALT') ?: 'replace-this-in-production'; $settings['update_free_access'] = FALSE; -if ($postmark_key = getenv('POSTMARK_API_KEY')) { - $config['symfony_mailer.mailer_transport.postmark']['configuration']['dsn'] = - 'postmark+api://' . $postmark_key . '@default'; -} - -// On localhost/DEBUG, use the core 'php_mail' interface (which respects sendmail_path -// from php.ini, overridden to our fake-sendmail.sh that logs the email to console -// and always succeeds). This guarantees booking requests never fail with -// "mail_failed" during development. -// In non-DEBUG (production), use symfony_mailer + Postmark. $is_dev = (bool) getenv('DEBUG'); +$postmark_key = getenv('POSTMARK_API_KEY'); + if ($is_dev) { $config['system.mail']['interface']['default'] = 'php_mail'; -} elseif ($postmark_key) { +} else { + if (!$postmark_key) { + throw new \RuntimeException('POSTMARK_API_KEY is not set — refusing to start without a mail transport.'); + } + $config['symfony_mailer.mailer_transport.postmark']['configuration']['dsn'] = + 'postmark+api://' . $postmark_key . '@default'; $config['mailer_transport.settings']['default_transport'] = 'postmark'; $config['system.mail']['interface']['default'] = 'symfony_mailer'; }