Skip to content

Commit

Permalink
Fixed www replacement in URL in the installer.
Browse files Browse the repository at this point in the history 
Co-authored-by: Alex Skrypnyk <[email protected]>
  • Loading branch information
@tannguyen04 @AlexSkrypnyk
tannguyen04 and AlexSkrypnyk authored Mar 29, 2024
1 parent 3b68164 commit 8c3f4ec
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion .scaffold/docs/content/workflows/variables.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,7 @@ Defined in: `.env`, `scripts/drevops/provision.sh`

Stage file proxy origin. Note that HTTP Auth provided by Shield will be<br />automatically added to the origin URL.

Default value: `https://your-site-url.example/`
Default value: `https://www.your-site-url.example/`

Defined in: `.env`

Expand Down
2 changes: 1 addition & 1 deletion .scaffold/tests/bats/_helper.bash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}" "#;<"
Expand Down
14 changes: 7 additions & 7 deletions .scaffold/tests/bats/fixtures/docker-compose.env.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions .scaffold/tests/bats/fixtures/docker-compose.env_local.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions .scaffold/tests/bats/fixtures/docker-compose.env_mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down

1 comment on commit 8c3f4ec

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 Published on https://drevops-scaffold-docs.netlify.app as production
🚀 Deployed on https://66073f18b87aa3679143462e--drevops-scaffold-docs.netlify.app

Please sign in to comment.