From be01ba4e225810583bfbc196d36fee26846ad803 Mon Sep 17 00:00:00 2001 From: Aaron Zinck Date: Tue, 26 Jul 2022 12:59:54 -0400 Subject: [PATCH 1/2] Updating redirects per EPA guidance --- services/drupal/.ddev/nginx_full/maps/redirect_301.map | 1 - services/drupal/redirect_301.map | 1 - services/drupal/redirect_302.map | 1 - 3 files changed, 3 deletions(-) diff --git a/services/drupal/.ddev/nginx_full/maps/redirect_301.map b/services/drupal/.ddev/nginx_full/maps/redirect_301.map index 90bd95a39d..9d2f032ae1 100644 --- a/services/drupal/.ddev/nginx_full/maps/redirect_301.map +++ b/services/drupal/.ddev/nginx_full/maps/redirect_301.map @@ -21,7 +21,6 @@ map $request_uri $new_uri_301 { ~*^\/airtrends(\/|$).* /air-trends; ~*^\/ampd(\/|$).* https://ampd.epa.gov/ampd; ~*^\/approved-sips(\/|$).* /air-quality-implementation-plans; - ~*^\/apti(\/|$).* https://www.apti-learn.net/LMS/EPAHomePage.aspx; ~*^\/aqi(\/|$).* https://www.airnow.gov/; ~*^\/arweb(\/|$).* https://semspub.epa.gov; ~*^\/beachkids(\/|$).* /beaches; diff --git a/services/drupal/redirect_301.map b/services/drupal/redirect_301.map index 82667f421b..935fdb3234 100644 --- a/services/drupal/redirect_301.map +++ b/services/drupal/redirect_301.map @@ -21,7 +21,6 @@ map $request_uri $new_uri_301 { ~*^\/airtrends(\/|$).* /air-trends; ~*^\/ampd(\/|$).* https://ampd.epa.gov/ampd; ~*^\/approved-sips(\/|$).* /air-quality-implementation-plans; - ~*^\/apti(\/|$).* https://www.apti-learn.net/LMS/EPAHomePage.aspx; ~*^\/aqi(\/|$).* https://www.airnow.gov/; ~*^\/arweb(\/|$).* https://semspub.epa.gov; ~*^\/beachkids(\/|$).* /beaches; diff --git a/services/drupal/redirect_302.map b/services/drupal/redirect_302.map index f5137a8971..703b7826f4 100644 --- a/services/drupal/redirect_302.map +++ b/services/drupal/redirect_302.map @@ -4,5 +4,4 @@ map $request_uri $new_uri_302 { # entries of form: #/old-url /new-url; - /test-302 http://www.google.com; } From 3e755838bca6834fcc1c0c20516510111e660a76 Mon Sep 17 00:00:00 2001 From: Aaron Zinck Date: Tue, 26 Jul 2022 13:05:59 -0400 Subject: [PATCH 2/2] Set the URI when running drush cron --- services/drupal/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/drupal/Dockerfile b/services/drupal/Dockerfile index 3c41dcb7ad..4ac85e7773 100644 --- a/services/drupal/Dockerfile +++ b/services/drupal/Dockerfile @@ -317,7 +317,7 @@ RUN chmod +x /webcms-entrypoint # Replace the default crontab with one that runs Drush every five minutes. By # default, cron is not run (since there is no systemd equivalent in containers), # but we use this in the Drush ECS service definition. -RUN echo '*/5 * * * * drush cron 2>&1' | crontab - +RUN echo '*/5 * * * * drush cron --uri="${WEBCMS_SITE_URL}" 2>&1' | crontab - # Wrap the entrypoint script with tini to allow graceful signal handling ENTRYPOINT ["tini", "--", "/webcms-entrypoint"]