Merge branch 'develop' into ISAICP-9456

.ddev/.env

@@ -5,7 +5,7 @@
 
 DRUPAL_TRUSTED_HOST_PATTERNS=.*
 
-DRUPAL_BASE_URL=https://joinup.ddev.site
+DRUPAL_BASE_URL=https://joinup.ddev.local
 DRUPAL_FILE_TEMP_PATH=/var/www/html/tmp
 
 DRUPAL_DATABASE_HOST=db
@@ -22,7 +22,7 @@ SEARCH_API_SERVER_SS_SOLR_HOST=solr-standalone
 SYMFONY_DEPRECATIONS_HELPER=max[total]=0&ignoreFile=core/.deprecation-ignore.txt
 WEBDRIVER_URL=http://selenium-chrome:4444/wd/hub
 
-DTT_BASE_URL=http://joinup.ddev.site
+DTT_BASE_URL=http://joinup.ddev.local
 DTT_API_URL=http://selenium-chrome:4444/wd/hub
 DTT_MINK_DRIVER_ARGS='["chrome", {"browserName":"chrome","goog:chromeOptions":{"w3c":false,"args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://selenium-chrome:4444/wd/hub"]'
 

.ddev/config.selenium-standalone-chrome.yaml

@@ -7,14 +7,14 @@
 web_environment:
   - BROWSERTEST_OUTPUT_DIRECTORY=/tmp
   - BROWSERTEST_OUTPUT_BASE_URL=${DDEV_PRIMARY_URL}
-  - SIMPLETEST_BASE_URL=https://joinup.ddev.site
+  - SIMPLETEST_BASE_URL=https://${DDEV_SITENAME}.${DDEV_TLD}
   - SIMPLETEST_DB=mysql://db:db@db/db
   # Use disable-dev-shm-usage instead of setting shm_usage
   # https://developers.google.com/web/tools/puppeteer/troubleshooting#tips
   # The format of chromeOptions is defined at https://chromedriver.chromium.org/capabilities
   - MINK_DRIVER_ARGS_WEBDRIVER=[\"chrome\", {\"browserName\":\"chrome\",\"goog:chromeOptions\":{\"w3c\":false,\"args\":[\"--disable-gpu\",\"--headless\", \"--no-sandbox\", \"--disable-dev-shm-usage\"]}}, \"http://selenium-chrome:4444/wd/hub\"]
   # Nightwatch
-  - DRUPAL_TEST_BASE_URL=https://joinup.ddev.site
+  - DRUPAL_TEST_BASE_URL=https://${DDEV_SITENAME}.${DDEV_TLD}
   - DRUPAL_TEST_DB_URL=mysql://db:db@db/db
   - DRUPAL_TEST_WEBDRIVER_HOSTNAME=selenium-chrome
   - DRUPAL_TEST_WEBDRIVER_PORT=4444
@@ -25,5 +25,5 @@ web_environment:
   - DRUPAL_NIGHTWATCH_IGNORE_DIRECTORIES=node_modules,vendor,.*,sites/*/files,sites/*/private,sites/simpletest
   - DRUPAL_NIGHTWATCH_OUTPUT=reports/nightwatch
   # DTT
-  - DTT_BASE_URL=https://joinup.ddev.site
+  - DTT_BASE_URL=https://${DDEV_SITENAME}.${DDEV_TLD}
   - DTT_MINK_DRIVER_ARGS=[\"chrome\", {\"browserName\":\"chrome\",\"goog:chromeOptions\":{\"w3c\":false,\"args\":[\"--disable-gpu\",\"--headless\", \"--no-sandbox\", \"--disable-dev-shm-usage\"]}}, \"http://selenium-chrome:4444/wd/hub\"]

.ddev/config.yaml

@@ -33,7 +33,8 @@ database:
 timezone: Europe/Brussels
 additional_hostnames: [ ]
 additional_fqdns: [ ]
-use_dns_when_possible: true
+project_tld: ddev.local
+use_dns_when_possible: false
 composer_version: "2"
 web_environment: [ ]
 disable_settings_management: true

README.md

@@ -263,12 +263,12 @@ Find out more on how to write custom commands [here](https://ddev.readthedocs.io
 
 ### Locally exposed services
 
-* https://joinup.ddev.site, http://joinup.ddev.site — The website
-* http://joinup.ddev.site:8890/sparql — The SPARQL endpoint
-* http://joinup.ddev.site:8983 — The Solr admin UI
-* https://joinup.ddev.site:7900, http://joinup.ddev.site:7910 — The Selenium
+* https://joinup.ddev.local, http://joinup.ddev.local — The website
+* http://joinup.ddev.local:8890/sparql — The SPARQL endpoint
+* http://joinup.ddev.local:8983 — The Solr admin UI
+* https://joinup.ddev.local:7900, http://joinup.ddev.local:7910 — The Selenium
   tests viewer
-* https://joinup.ddev.site:8026, http://joinup.ddev.site:8025 — The mailcatcher
+* https://joinup.ddev.local:8026, http://joinup.ddev.local:8025 — The mailcatcher
   UI (Mailpit)
 * To connect locally to MySQL, you'll need to find the port as this is
   dynamically allocated each time. Run:
@@ -365,7 +365,7 @@ during development. Mailpit is optional, as the default setup of Interoperable E
 use the devel mail server which stores the emails as text messages in the tmp
 directory. However, Mailpit is more convenient to use, as it provides a web UI
 to view the emails.
-You can access the Mailpit UI at https://joinup.ddev.site:8026.
+You can access the Mailpit UI at https://joinup.ddev.local:8026.
 
 ### Additional information