diff --git a/.env b/.env index 545d1b454..c957e710e 100644 --- a/.env +++ b/.env @@ -47,7 +47,7 @@ DRUPAL_THEME=your_site_theme # Stage file proxy origin. Note that HTTP Auth provided by Shield will be # automatically added to the origin URL. -DRUPAL_STAGE_FILE_PROXY_ORIGIN=https://your-site-url.example/ +DRUPAL_STAGE_FILE_PROXY_ORIGIN=https://www.your-site-url.example/ # Shield print message. DRUPAL_SHIELD_PRINT="Restricted access." diff --git a/.scaffold/docs/content/workflows/variables.mdx b/.scaffold/docs/content/workflows/variables.mdx index 4a771d3e1..9359028e1 100644 --- a/.scaffold/docs/content/workflows/variables.mdx +++ b/.scaffold/docs/content/workflows/variables.mdx @@ -1607,7 +1607,7 @@ Defined in: `.env`, `scripts/drevops/provision.sh` Stage file proxy origin. Note that HTTP Auth provided by Shield will be
automatically added to the origin URL. -Default value: `https://your-site-url.example/` +Default value: `https://www.your-site-url.example/` Defined in: `.env` diff --git a/.scaffold/tests/bats/_helper.bash b/.scaffold/tests/bats/_helper.bash index d40c8307e..1ef82fbf1 100644 --- a/.scaffold/tests/bats/_helper.bash +++ b/.scaffold/tests/bats/_helper.bash @@ -531,7 +531,7 @@ assert_files_present_drupal() { assert_dir_not_contains_string "${dir}" "your_site_theme" assert_dir_not_contains_string "${dir}" "your_org" assert_dir_not_contains_string "${dir}" "YOURORG" - assert_dir_not_contains_string "${dir}" "your-site-url.example" + assert_dir_not_contains_string "${dir}" "www.your-site-url.example" # Assert all special comments were removed. assert_dir_not_contains_string "${dir}" "#;" assert_dir_not_contains_string "${dir}" "#;<" diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env.json b/.scaffold/tests/bats/fixtures/docker-compose.env.json index c5c03bee4..6fb2088be 100644 --- a/.scaffold/tests/bats/fixtures/docker-compose.env.json +++ b/.scaffold/tests/bats/fixtures/docker-compose.env.json @@ -54,7 +54,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", "LAGOON_PROJECT": "your_site", @@ -127,7 +127,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", "LAGOON_PROJECT": "your_site", @@ -202,7 +202,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", "LAGOON_PROJECT": "your_site", @@ -284,7 +284,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", "LAGOON_PROJECT": "your_site", @@ -363,7 +363,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", "LAGOON_PROJECT": "your_site", @@ -452,7 +452,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", "LAGOON_PROJECT": "your_site", @@ -551,7 +551,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", "LAGOON_PROJECT": "your_site", diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env_local.json b/.scaffold/tests/bats/fixtures/docker-compose.env_local.json index bf956e55c..4fc2d5d51 100644 --- a/.scaffold/tests/bats/fixtures/docker-compose.env_local.json +++ b/.scaffold/tests/bats/fixtures/docker-compose.env_local.json @@ -62,7 +62,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", @@ -144,7 +144,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", @@ -228,7 +228,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", @@ -319,7 +319,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", @@ -407,7 +407,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", @@ -505,7 +505,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", @@ -613,7 +613,7 @@ "DRUPAL_SHIELD_PASS": "", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json b/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json index 26dc83686..9275f7282 100644 --- a/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json +++ b/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json @@ -56,7 +56,7 @@ "DRUPAL_SHIELD_PASS": "passw", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", "LAGOON_PROJECT": "your_site", @@ -131,7 +131,7 @@ "DRUPAL_SHIELD_PASS": "passw", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", "LAGOON_PROJECT": "your_site", @@ -208,7 +208,7 @@ "DRUPAL_SHIELD_PASS": "passw", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", "LAGOON_PROJECT": "your_site", @@ -292,7 +292,7 @@ "DRUPAL_SHIELD_PASS": "passw", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", "LAGOON_PROJECT": "your_site", @@ -373,7 +373,7 @@ "DRUPAL_SHIELD_PASS": "passw", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", "LAGOON_PROJECT": "your_site", @@ -464,7 +464,7 @@ "DRUPAL_SHIELD_PASS": "passw", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", "LAGOON_PROJECT": "your_site", @@ -565,7 +565,7 @@ "DRUPAL_SHIELD_PASS": "passw", "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://your-site-url.example/", + "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", "LAGOON_PROJECT": "your_site",