Merge branch 'appscan-20220629-hotfix' into live

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;

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"]

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;

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;
 }